diff --git a/common/Android.mk b/common/Android.mk index 54db505..df9da0e 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -51,18 +51,6 @@ LOCAL_DEX_PREOPT := false LOCAL_MODULE_SUFFIX := .apk include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := GoogleBackupTransport -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -LOCAL_PRIVILEGED_MODULE := true -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := GoogleFeedback LOCAL_MODULE_OWNER := gapps @@ -145,9 +133,9 @@ LOCAL_PRIVILEGED_MODULE := true include $(BUILD_PREBUILT) include $(CLEAR_VARS) -LOCAL_MODULE := SetupWizard +LOCAL_MODULE := SetupWizardPrebuilt LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/SetupWizard/SetupWizard.apk +LOCAL_SRC_FILES := proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk LOCAL_OVERRIDES_PACKAGES := Provision LOCAL_CERTIFICATE := PRESIGNED LOCAL_MODULE_TAGS := optional diff --git a/common/common-vendor.mk b/common/common-vendor.mk index fbcfe37..0acbf36 100644 --- a/common/common-vendor.mk +++ b/common/common-vendor.mk @@ -15,9 +15,10 @@ # This file is generated by device/gapps//setup-makefiles.sh PRODUCT_COPY_FILES += \ - vendor/gapps/common/proprietary/etc/default-permissions/default-permissions.xml:system/etc/default-permissions/default-permissions.xml \ vendor/gapps/common/proprietary/etc/permissions/com.google.android.dialer.support.xml:system/etc/permissions/com.google.android.dialer.support.xml \ vendor/gapps/common/proprietary/etc/permissions/com.google.android.maps.xml:system/etc/permissions/com.google.android.maps.xml \ + vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google-p.xml:system/etc/permissions/privapp-permissions-google-p.xml \ + vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml:system/etc/permissions/privapp-permissions-google-ps.xml \ vendor/gapps/common/proprietary/etc/permissions/privapp-permissions-google.xml:system/etc/permissions/privapp-permissions-google.xml \ vendor/gapps/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml:system/etc/sysconfig/google-hiddenapi-package-whitelist.xml \ vendor/gapps/common/proprietary/etc/sysconfig/google.xml:system/etc/sysconfig/google.xml \ @@ -27,7 +28,6 @@ PRODUCT_PACKAGES += \ GoogleCalendarSyncAdapter \ GoogleContactsSyncAdapter \ PrebuiltExchange3Google \ - GoogleBackupTransport \ GoogleFeedback \ GooglePartnerSetup \ GoogleServicesFramework \ @@ -38,5 +38,5 @@ ifeq ($(TARGET_IS_GROUPER),) PRODUCT_PACKAGES += \ AndroidMigratePrebuilt \ - SetupWizard + SetupWizardPrebuilt endif diff --git a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk index 880d2a0..9ea0f4e 100644 Binary files a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ diff --git a/common/proprietary/etc/default-permissions/default-permissions.xml b/common/proprietary/etc/default-permissions/default-permissions.xml deleted file mode 100644 index dcc9c0a..0000000 --- a/common/proprietary/etc/default-permissions/default-permissions.xml +++ /dev/null @@ -1,105 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/proprietary/etc/permissions/com.google.android.dialer.support.xml b/common/proprietary/etc/permissions/com.google.android.dialer.support.xml index 28ef29f..87e627d 100644 --- a/common/proprietary/etc/permissions/com.google.android.dialer.support.xml +++ b/common/proprietary/etc/permissions/com.google.android.dialer.support.xml @@ -3,7 +3,7 @@ Play Store. This will be deprecated once Google Dialer play store updates stop supporting pre-O devices. --> + file="/product/framework/com.google.android.dialer.support.jar" /> diff --git a/common/proprietary/etc/permissions/com.google.android.maps.xml b/common/proprietary/etc/permissions/com.google.android.maps.xml index 5be5c2c..1f68365 100644 --- a/common/proprietary/etc/permissions/com.google.android.maps.xml +++ b/common/proprietary/etc/permissions/com.google.android.maps.xml @@ -4,9 +4,9 @@ Licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - + http://www.apache.org/licenses/LICENSE-2.0 - + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. @@ -16,5 +16,5 @@ + file="/product/framework/com.google.android.maps.jar" /> diff --git a/common/proprietary/etc/permissions/privapp-permissions-google-p.xml b/common/proprietary/etc/permissions/privapp-permissions-google-p.xml new file mode 100644 index 0000000..f2cedad --- /dev/null +++ b/common/proprietary/etc/permissions/privapp-permissions-google-p.xml @@ -0,0 +1,308 @@ + + + + + + + + + + + + + . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml b/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml new file mode 100644 index 0000000..90ccf11 --- /dev/null +++ b/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml @@ -0,0 +1,312 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/proprietary/etc/permissions/privapp-permissions-google.xml b/common/proprietary/etc/permissions/privapp-permissions-google.xml index 44d6287..3c3b4d7 100644 --- a/common/proprietary/etc/permissions/privapp-permissions-google.xml +++ b/common/proprietary/etc/permissions/privapp-permissions-google.xml @@ -17,384 +17,57 @@ - - - - - - - - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - + + + + + + + + + + + + + + + + + + @@ -402,73 +75,8 @@ It allows additional grants on top of privapp-permissions-platform.xml - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml b/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml index 1721a10..0a131a9 100644 --- a/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml +++ b/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml @@ -50,6 +50,7 @@ This XML file declares which platform apps that need to access internal APIs. + @@ -74,9 +75,10 @@ This XML file declares which platform apps that need to access internal APIs. - + + @@ -97,6 +99,7 @@ This XML file declares which platform apps that need to access internal APIs. + diff --git a/common/proprietary/etc/sysconfig/google.xml b/common/proprietary/etc/sysconfig/google.xml index da7678c..57c6aa6 100644 --- a/common/proprietary/etc/sysconfig/google.xml +++ b/common/proprietary/etc/sysconfig/google.xml @@ -23,6 +23,7 @@ + @@ -93,5 +94,13 @@ - + + + + + + + diff --git a/common/proprietary/framework/com.google.android.dialer.support.jar b/common/proprietary/framework/com.google.android.dialer.support.jar index 7a9e229..57faecd 100644 Binary files a/common/proprietary/framework/com.google.android.dialer.support.jar and b/common/proprietary/framework/com.google.android.dialer.support.jar differ diff --git a/common/proprietary/framework/com.google.android.maps.jar b/common/proprietary/framework/com.google.android.maps.jar index 5e02402..0f2ebaf 100644 Binary files a/common/proprietary/framework/com.google.android.maps.jar and b/common/proprietary/framework/com.google.android.maps.jar differ diff --git a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk deleted file mode 100644 index 25b3793..0000000 Binary files a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk and /dev/null differ diff --git a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk index af5f86c..c82bfa0 100644 Binary files a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk and b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk differ diff --git a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk index a08dcb0..3083f2b 100644 Binary files a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk differ diff --git a/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk index 2507a30..0043e80 100644 Binary files a/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and b/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ diff --git a/common/proprietary/priv-app/Phonesky/Phonesky.apk b/common/proprietary/priv-app/Phonesky/Phonesky.apk index f802e18..a9ed633 100644 Binary files a/common/proprietary/priv-app/Phonesky/Phonesky.apk and b/common/proprietary/priv-app/Phonesky/Phonesky.apk differ diff --git a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk deleted file mode 100644 index 1bd0a36..0000000 Binary files a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk and /dev/null differ diff --git a/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk new file mode 100644 index 0000000..3ea8c76 Binary files /dev/null and b/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt index 94cef06..c28bcd8 100644 --- a/proprietary-files-common-nongrouper.txt +++ b/proprietary-files-common-nongrouper.txt @@ -1,2 +1,2 @@ -priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc --priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|cef140e63d5dd861a876b3b24b9e21c82d3749ef +-priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt index 37c95ae..94476e3 100644 --- a/proprietary-files-common.txt +++ b/proprietary-files-common.txt @@ -2,7 +2,6 @@ -app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED -app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2 --priv-app/GoogleBackupTransport/GoogleBackupTransport.apk;PRESIGNED -priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED @@ -11,11 +10,11 @@ -framework/com.google.android.maps.jar;PRESIGNED -framework/com.google.android.dialer.support.jar;PRESIGNED -etc/default-permissions/default-permissions.xml|70fde12d8283ff81dbe9ec3480259ccc9df0c227 - etc/permissions/com.google.android.maps.xml etc/permissions/com.google.android.dialer.support.xml -etc/permissions/privapp-permissions-google.xml|8295b2743b05191eeb7b1992c02a7a59aba338dd +etc/permissions/privapp-permissions-google.xml +etc/permissions/privapp-permissions-google-p.xml +etc/permissions/privapp-permissions-google-ps.xml etc/sysconfig/google-hiddenapi-package-whitelist.xml etc/sysconfig/google.xml diff --git a/setup-makefiles.sh b/setup-makefiles.sh index f1b027f..7736e22 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -55,7 +55,7 @@ echo "endif" >> "$ANDROIDMK" sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK" # Make Google SuW override Provision -sed -i 's/\(SetupWizard.apk\)/\1\nLOCAL_OVERRIDES_PACKAGES := Provision/' "$ANDROIDMK" +sed -i 's/\(SetupWizardPrebuilt.apk\)/\1\nLOCAL_OVERRIDES_PACKAGES := Provision/' "$ANDROIDMK" # We are done with common write_footers