diff --git a/arm/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk b/arm/proprietary/product/app/SpeechServicesByGoogle/SpeechServicesByGoogle.apk
index a14272b..8040b89 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 a3322bc..83ec713 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 a13c358..39e0bf2 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:10d546dfb9aa692a5c35897c112db4785e4b72252e3a7baafc98bff41bbbe9f2
-size 153879125
+oid sha256:25c27184482da38ea7ddc8b75488eaeb49e756dae1096ded20912092ea30c19b
+size 175350630
diff --git a/arm/proprietary/product/priv-app/Phonesky/Phonesky.apk b/arm/proprietary/product/priv-app/Phonesky/Phonesky.apk
index 62546f5..262fba1 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 649a17d..063f6ed 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:7fd65ae15011d0127903de8ce119a2f56c5c477d2c959f0c81c3f41cf23c43fa
-size 254026983
+oid sha256:59895254da4ac8cb7cf0bc379a226b8c78e1aa1fdc64d5b5ea5337916ac78440
+size 254491804
diff --git a/arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk b/arm/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk
index 3a1dab1..555c8fe 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/proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk b/arm64/proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk
index a6df8e7..5df4349 100644
Binary files a/arm64/proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk and b/arm64/proprietary/product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk differ
diff --git a/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk b/arm64/proprietary/product/priv-app/VelvetTitan/VelvetTitan.apk
index 15ac06f..f115515 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:8842a71e462f668709bd8e6bad44e93c916c6ca71214eb48d3d2e99c62ebb0cb
-size 466761761
+oid sha256:097d72cc9e334d4203cd8ad946cd0afe93191d87a9084fce358cd468570f3c81
+size 434458352
diff --git a/build/gapps.sh b/build/gapps.sh
index a2db6af..c80405e 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=15.0.0
-SDKV=35
+ANDROIDV=16.0.0
+SDKV=36
GARCH=$1
CPUARCH=$GARCH
[ ! -z "$2" ] && CPUARCH=$2
diff --git a/cicd/verify-permissions.py b/cicd/verify-permissions.py
index 574310c..a2a0f92 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-22.0/core/res/AndroidManifest.xml'
+ 'https://raw.githubusercontent.com/LineageOS/android_frameworks_base/lineage-23.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 4886c42..b903f75 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/init/gapps.rc b/common/proprietary/product/etc/init/gapps.rc
index 6fd124b..6f9a34d 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 15_202408
+ setprop ro.com.google.gmsversion 16_202505
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 a7706df..78f46a0 100644
--- a/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml
+++ b/common/proprietary/product/etc/permissions/privapp-permissions-google-product.xml
@@ -103,6 +103,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
@@ -120,7 +121,6 @@ It allows additional grants on top of privapp-permissions-platform.xml
-
@@ -195,7 +195,9 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
+
@@ -212,7 +214,11 @@ It allows additional grants on top of privapp-permissions-platform.xml
-
+
+
+
+
+
@@ -252,9 +258,11 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
+
@@ -282,6 +290,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
@@ -303,6 +312,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
@@ -310,6 +320,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
@@ -365,6 +376,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
@@ -376,8 +388,11 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
+
+
@@ -385,6 +400,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
@@ -394,6 +410,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
diff --git a/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml b/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml
index 5a0447a..3ff1aa4 100644
--- a/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml
+++ b/common/proprietary/product/etc/permissions/privapp-permissions-mtg.xml
@@ -1,11 +1,6 @@
-
-
-
-
-
diff --git a/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk b/common/proprietary/product/priv-app/AndroidAutoStub/AndroidAutoStub.apk
index 1645712..b8aadbd 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 04f14ee..6a8b3bd 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 5b46e7a..8417c73 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 5fb153e..cf9f0c0 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/etc/permissions/privapp-permissions-google-system-ext.xml b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml
index a10ba27..a9d7c8d 100644
--- a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml
+++ b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-system-ext.xml
@@ -8,6 +8,7 @@ It allows additional grants on top of privapp-permissions-platform.xml
+
diff --git a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk
index f70daca..56b9cbd 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 2565b73..562c85d 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 b693878..18f46b9 100644
--- a/overlay/GmsOverlay/apktool.yml
+++ b/overlay/GmsOverlay/apktool.yml
@@ -8,8 +8,8 @@ packageInfo:
renameManifestPackage: null
resourcesAreCompressed: false
sdkInfo:
- minSdkVersion: '35'
- targetSdkVersion: '35'
+ minSdkVersion: '36'
+ targetSdkVersion: '36'
sharedLibrary: false
sparseResources: true
unknownFiles: {}
diff --git a/overlay/GmsSettingsOverlay/apktool.yml b/overlay/GmsSettingsOverlay/apktool.yml
index 79e56a1..d85a5c5 100644
--- a/overlay/GmsSettingsOverlay/apktool.yml
+++ b/overlay/GmsSettingsOverlay/apktool.yml
@@ -8,8 +8,8 @@ packageInfo:
renameManifestPackage: null
resourcesAreCompressed: false
sdkInfo:
- minSdkVersion: '35'
- targetSdkVersion: '35'
+ minSdkVersion: '36'
+ targetSdkVersion: '36'
sharedLibrary: false
sparseResources: true
unknownFiles: {}
diff --git a/overlay/GmsSettingsProviderOverlay/apktool.yml b/overlay/GmsSettingsProviderOverlay/apktool.yml
index 70900aa..7e2bcb0 100644
--- a/overlay/GmsSettingsProviderOverlay/apktool.yml
+++ b/overlay/GmsSettingsProviderOverlay/apktool.yml
@@ -8,8 +8,8 @@ packageInfo:
renameManifestPackage: null
resourcesAreCompressed: false
sdkInfo:
- minSdkVersion: '35'
- targetSdkVersion: '35'
+ minSdkVersion: '36'
+ targetSdkVersion: '36'
sharedLibrary: false
sparseResources: true
unknownFiles: {}
diff --git a/overlay/GmsSetupWizardOverlay/apktool.yml b/overlay/GmsSetupWizardOverlay/apktool.yml
index 6bdb5e4..55cc1e9 100644
--- a/overlay/GmsSetupWizardOverlay/apktool.yml
+++ b/overlay/GmsSetupWizardOverlay/apktool.yml
@@ -8,8 +8,8 @@ packageInfo:
renameManifestPackage: null
resourcesAreCompressed: false
sdkInfo:
- minSdkVersion: '35'
- targetSdkVersion: '35'
+ minSdkVersion: '36'
+ targetSdkVersion: '36'
sharedLibrary: false
sparseResources: true
unknownFiles: {}
diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt
index 1ef5c3c..4c5e4ff 100644
--- a/proprietary-files-arm64-nongrouper.txt
+++ b/proprietary-files-arm64-nongrouper.txt
@@ -1,7 +1,7 @@
-product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk;PRESIGNED|474ca0e1fb0e6340b647142b3f493055fcb3990f
+product/app/MarkupGoogle_v2/MarkupGoogle_v2.apk;PRESIGNED|69055955ef86dec796baf155f9ba14c2df29ef44
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|bb7c2f3fadfee4dda509daba285fec3dfffeed7e
+product/priv-app/VelvetTitan/VelvetTitan.apk;OVERRIDES=Velvet;PRESIGNED|782eb1875dd7944634899eeb1f8c10dee6456bd9
system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED
diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt
index c1bbebb..ec71897 100644
--- a/proprietary-files-common.txt
+++ b/proprietary-files-common.txt
@@ -2,7 +2,7 @@ product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED
product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED|ec9673f50e4c4dfd2bfcb784d2d8082ef48d1e23
product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2
-product/priv-app/AndroidAutoStub/AndroidAutoStub.apk;PRESIGNED
+product/priv-app/AndroidAutoStub/AndroidAutoStub.apk;PRESIGNED|54d8dfc8f4633194b11eff1c23ff4632892634e3
product/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED
product/framework/com.google.android.dialer.support.jar;PRESIGNED
@@ -10,7 +10,7 @@ product/framework/com.google.android.dialer.support.jar;PRESIGNED
product/etc/default-permissions/default-permissions-google.xml
product/etc/default-permissions/default-permissions-mtg.xml|b0e11fec4c6d134e205a856733bc89d95f2f24c9
-product/etc/init/gapps.rc|1b9e076965fe08a03cf90fed0e96f2aa4ac90c0e
+product/etc/init/gapps.rc|29368f8d6b85b8d6f0b5a262432aae12ad75173d
product/etc/permissions/com.google.android.dialer.support.xml
product/etc/permissions/privapp-permissions-google-product.xml