diff --git a/arm/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk b/arm/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk index ad44c7d..a14272b 100644 Binary files a/arm/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk and b/arm/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk differ diff --git a/arm/proprietary/product/app/talkback/talkback.apk b/arm/proprietary/product/app/talkback/talkback.apk index f0796db..a3322bc 100644 Binary files a/arm/proprietary/product/app/talkback/talkback.apk and b/arm/proprietary/product/app/talkback/talkback.apk differ diff --git a/arm/proprietary/product/priv-app/GmsCore/GmsCore.apk b/arm/proprietary/product/priv-app/GmsCore/GmsCore.apk index 523cffa..a13c358 100644 --- a/arm/proprietary/product/priv-app/GmsCore/GmsCore.apk +++ b/arm/proprietary/product/priv-app/GmsCore/GmsCore.apk @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:74c5f371b97a67b83e0d3b82a630cf38bb6a823f0067e2c6757b126d31e28835 -size 130422753 +oid sha256:10d546dfb9aa692a5c35897c112db4785e4b72252e3a7baafc98bff41bbbe9f2 +size 153879125 diff --git a/arm/proprietary/product/priv-app/Phonesky/Phonesky.apk b/arm/proprietary/product/priv-app/Phonesky/Phonesky.apk index 4c8866c..62546f5 100644 Binary files a/arm/proprietary/product/priv-app/Phonesky/Phonesky.apk and b/arm/proprietary/product/priv-app/Phonesky/Phonesky.apk differ diff --git a/arm/proprietary/product/priv-app/Velvet/Velvet.apk b/arm/proprietary/product/priv-app/Velvet/Velvet.apk index 13165ae..649a17d 100644 --- a/arm/proprietary/product/priv-app/Velvet/Velvet.apk +++ b/arm/proprietary/product/priv-app/Velvet/Velvet.apk @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:5256cd68f4ca4a293894d193ca70c600cd87dfce2ddc2ec1200e9ea494ac2403 -size 249415761 +oid sha256:7fd65ae15011d0127903de8ce119a2f56c5c477d2c959f0c81c3f41cf23c43fa +size 254026983 diff --git a/arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk b/arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk index 1a5b860..3a1dab1 100755 Binary files a/arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk and b/arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk differ diff --git a/arm64/Android.bp b/arm64/Android.bp index 861f7f4..1c04ff7 100644 --- a/arm64/Android.bp +++ b/arm64/Android.bp @@ -56,9 +56,9 @@ android_app_import { } android_app_import { - name: "MarkupGoogle", + name: "MarkupGoogle_v2", owner: "gapps", - apk: "proprietary/product/app/MarkupGoogle/MarkupGoogle.apk", + apk: "proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk", preprocessed: true, presigned: true, dex_preopt: { diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk index 1f42576..2ca96ac 100644 --- a/arm64/arm64-vendor.mk +++ b/arm64/arm64-vendor.mk @@ -14,7 +14,7 @@ PRODUCT_PACKAGES += \ ifeq ($(TARGET_IS_GROUPER),) PRODUCT_PACKAGES += \ - MarkupGoogle \ + MarkupGoogle_v2 \ SpeechServicesByGoogle \ talkback \ Velvet \ diff --git a/arm64/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk b/arm64/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk deleted file mode 100644 index dc8cfaf..0000000 Binary files a/arm64/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk and /dev/null differ diff --git a/arm64/proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk b/arm64/proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk new file mode 100644 index 0000000..a6df8e7 Binary files /dev/null and b/arm64/proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk differ diff --git a/arm64/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk b/arm64/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk index 1b60a35..3e9f66b 100644 Binary files a/arm64/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk and b/arm64/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk differ diff --git a/arm64/proprietary/product/app/talkback/talkback.apk b/arm64/proprietary/product/app/talkback/talkback.apk index af19453..0633436 100644 Binary files a/arm64/proprietary/product/app/talkback/talkback.apk and b/arm64/proprietary/product/app/talkback/talkback.apk differ diff --git a/arm64/proprietary/product/priv-app/GmsCore/GmsCore.apk b/arm64/proprietary/product/priv-app/GmsCore/GmsCore.apk index b5d3806..2cf44e2 100644 --- a/arm64/proprietary/product/priv-app/GmsCore/GmsCore.apk +++ b/arm64/proprietary/product/priv-app/GmsCore/GmsCore.apk @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:dfca71b10a2d5c99a36fb7b15436f2e6b529a439caf500aa7ff855bfa1aaa0a8 -size 142424509 +oid sha256:38eb121872076788b3e2cba8006032ca4eaee569514403cf159d49f47a526d4d +size 168192577 diff --git a/arm64/proprietary/product/priv-app/Phonesky/Phonesky.apk b/arm64/proprietary/product/priv-app/Phonesky/Phonesky.apk index 0e75d98..5bd67c0 100644 Binary files a/arm64/proprietary/product/priv-app/Phonesky/Phonesky.apk and b/arm64/proprietary/product/priv-app/Phonesky/Phonesky.apk differ diff --git a/arm64/proprietary/product/priv-app/Velvet/Velvet.apk b/arm64/proprietary/product/priv-app/Velvet/Velvet.apk index 6337af2..f6bab8c 100644 --- a/arm64/proprietary/product/priv-app/Velvet/Velvet.apk +++ b/arm64/proprietary/product/priv-app/Velvet/Velvet.apk @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:971640eeec3757b11b81df5d32472766c3207d0bd6ca4b8c590e262bad68f188 -size 277031022 +oid sha256:f70140dcce0f99272c1406fe611a9145b730bc4ef25d79b0a57a587180e8ad6b +size 276600062 diff --git a/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk b/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk index a558e36..15ac06f 100644 --- a/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk +++ b/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:28e9b14569682bf49f807178b8cb174bc53b37e127ed9f5ad5d590a1ffaa26f0 -size 414239895 +oid sha256:8842a71e462f668709bd8e6bad44e93c916c6ca71214eb48d3d2e99c62ebb0cb +size 466761761 diff --git a/arm64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk b/arm64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk index 411237a..46862d2 100644 Binary files a/arm64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk and b/arm64/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk differ diff --git a/build/gapps.sh b/build/gapps.sh index 1982d13..6010670 100755 --- a/build/gapps.sh +++ b/build/gapps.sh @@ -8,8 +8,8 @@ # DATE=$(date -u +%Y%m%d_%H%M%S) export GAPPS_TOP=$(realpath .) -ANDROIDV=14.0.0 -SDKV=34 +ANDROIDV=15.0.0 +SDKV=35 GARCH=$1 CPUARCH=$GARCH [ ! -z "$2" ] && CPUARCH=$2 diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary index de189c7..b0f0dd3 100644 --- a/build/meta/com/google/android/update-binary +++ b/build/meta/com/google/android/update-binary @@ -107,7 +107,7 @@ compute_apps_size() { remove_big_optional_apps() { ui_print "Low resource device detected, removing large extras" rm -rf product/app/GoogleTTS - rm -rf product/app/MarkupGoogle + rm -rf product/app/MarkupGoogle_v2 rm -rf product/app/SpeechServicesByGoogle rm -rf product/app/talkback rm -rf product/priv-app/GoogleRestore diff --git a/cicd/verify-permissions.py b/cicd/verify-permissions.py index d9fcc6a..14bcd3f 100755 --- a/cicd/verify-permissions.py +++ b/cicd/verify-permissions.py @@ -37,7 +37,7 @@ os.chdir(sys.path[0]) # Definitions for privileged permissions ANDROID_MANIFEST_XML = \ - 'https://raw.githubusercontent.com/LineageOS/android_frameworks_base/lineage-21.0/core/res/AndroidManifest.xml' + 'https://raw.githubusercontent.com/LineageOS/android_frameworks_base/lineage-22.0/core/res/AndroidManifest.xml' ANDROID_XML_NS = '{http://schemas.android.com/apk/res/android}' privileged_permissions = set() privileged_permission_mask = {'privileged', 'signature'} diff --git a/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk index 4322711..4886c42 100644 Binary files a/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk and b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk differ diff --git a/common/proprietary/product/etc/default-permissions/default-permissions-google.xml b/common/proprietary/product/etc/default-permissions/default-permissions-google.xml index c2cb22b..0b41ad1 100644 --- a/common/proprietary/product/etc/default-permissions/default-permissions-google.xml +++ b/common/proprietary/product/etc/default-permissions/default-permissions-google.xml @@ -41,4 +41,30 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/common/proprietary/product/etc/init/gapps.rc b/common/proprietary/product/etc/init/gapps.rc index 5250bba..6fd124b 100644 --- a/common/proprietary/product/etc/init/gapps.rc +++ b/common/proprietary/product/etc/init/gapps.rc @@ -1,3 +1,3 @@ on init - setprop ro.com.google.gmsversion 14_202310 + setprop ro.com.google.gmsversion 15_202408 setprop ro.opa.eligible_device true diff --git a/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml b/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml index 6d27489..04315b6 100644 --- a/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml +++ b/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml @@ -12,8 +12,11 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + @@ -64,17 +67,20 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + @@ -101,6 +107,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -130,7 +137,13 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + + + + @@ -145,6 +158,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -153,6 +167,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -210,6 +225,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -217,6 +233,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -224,6 +241,8 @@ It allows additional grants on top of privapp-permissions-platform.xml + + @@ -256,15 +275,18 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + @@ -276,10 +298,13 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + @@ -288,6 +313,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -297,6 +323,9 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + @@ -358,6 +387,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -366,7 +396,9 @@ It allows additional grants on top of privapp-permissions-platform.xml + + diff --git a/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk b/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk index 4c464e9..990c985 100644 Binary files a/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk and b/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk differ diff --git a/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk index 608c02e..04f14ee 100644 Binary files a/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and b/common/proprietary/product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ diff --git a/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk b/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk index 51d3ba9..5b46e7a 100644 Binary files a/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk and b/common/proprietary/product/priv-app/GoogleRestore/GoogleRestore.apk differ diff --git a/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk b/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk index 3d48915..5fb153e 100644 Binary files a/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk and b/common/proprietary/product/priv-app/Wellbeing/Wellbeing.apk differ diff --git a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk index e0ef59a..f70daca 100644 Binary files a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk and b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk differ diff --git a/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk index 2ee7c0f..2565b73 100644 Binary files a/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ diff --git a/overlay/GmsOverlay/apktool.yml b/overlay/GmsOverlay/apktool.yml index ad3ebd3..b693878 100644 --- a/overlay/GmsOverlay/apktool.yml +++ b/overlay/GmsOverlay/apktool.yml @@ -8,8 +8,8 @@ packageInfo: renameManifestPackage: null resourcesAreCompressed: false sdkInfo: - minSdkVersion: '34' - targetSdkVersion: '34' + minSdkVersion: '35' + targetSdkVersion: '35' sharedLibrary: false sparseResources: true unknownFiles: {} diff --git a/overlay/GmsSettingsOverlay/apktool.yml b/overlay/GmsSettingsOverlay/apktool.yml index 2cfcba2..79e56a1 100644 --- a/overlay/GmsSettingsOverlay/apktool.yml +++ b/overlay/GmsSettingsOverlay/apktool.yml @@ -8,8 +8,8 @@ packageInfo: renameManifestPackage: null resourcesAreCompressed: false sdkInfo: - minSdkVersion: '34' - targetSdkVersion: '34' + minSdkVersion: '35' + targetSdkVersion: '35' sharedLibrary: false sparseResources: true unknownFiles: {} diff --git a/overlay/GmsSettingsProviderOverlay/apktool.yml b/overlay/GmsSettingsProviderOverlay/apktool.yml index b69decf..70900aa 100644 --- a/overlay/GmsSettingsProviderOverlay/apktool.yml +++ b/overlay/GmsSettingsProviderOverlay/apktool.yml @@ -8,8 +8,8 @@ packageInfo: renameManifestPackage: null resourcesAreCompressed: false sdkInfo: - minSdkVersion: '34' - targetSdkVersion: '34' + minSdkVersion: '35' + targetSdkVersion: '35' sharedLibrary: false sparseResources: true unknownFiles: {} diff --git a/overlay/GmsSetupWizardOverlay/apktool.yml b/overlay/GmsSetupWizardOverlay/apktool.yml index 874c633..6bdb5e4 100644 --- a/overlay/GmsSetupWizardOverlay/apktool.yml +++ b/overlay/GmsSetupWizardOverlay/apktool.yml @@ -8,8 +8,8 @@ packageInfo: renameManifestPackage: null resourcesAreCompressed: false sdkInfo: - minSdkVersion: '34' - targetSdkVersion: '34' + minSdkVersion: '35' + targetSdkVersion: '35' sharedLibrary: false sparseResources: true unknownFiles: {} diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt index 0979536..1ef5c3c 100644 --- a/proprietary-files-arm64-nongrouper.txt +++ b/proprietary-files-arm64-nongrouper.txt @@ -1,7 +1,7 @@ -product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|ed68878a8a06ca8c06dbc98441a657168f1b378b +product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk;PRESIGNED|474ca0e1fb0e6340b647142b3f493055fcb3990f product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk;PRESIGNED product/app/talkback/talkback.apk;PRESIGNED product/priv-app/Velvet/Velvet.apk;PRESIGNED -product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|0251d61f74f0557ccfd0e0424bed31e5828ea4b5 +product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|bb7c2f3fadfee4dda509daba285fec3dfffeed7e system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED