diff --git a/arm/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/arm/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk index 586f0c2..7deedfb 100644 Binary files a/arm/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and b/arm/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ diff --git a/arm/proprietary/priv-app/Velvet/Velvet.apk b/arm/proprietary/priv-app/Velvet/Velvet.apk index 4cf7ee7..d099c9d 100644 Binary files a/arm/proprietary/priv-app/Velvet/Velvet.apk and b/arm/proprietary/priv-app/Velvet/Velvet.apk differ diff --git a/arm64/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/arm64/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk index 35f5005..7703f9e 100644 Binary files a/arm64/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and b/arm64/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ diff --git a/arm64/proprietary/priv-app/Velvet/Velvet.apk b/arm64/proprietary/priv-app/Velvet/Velvet.apk index c0958d2..0e7e8fd 100644 Binary files a/arm64/proprietary/priv-app/Velvet/Velvet.apk and b/arm64/proprietary/priv-app/Velvet/Velvet.apk differ diff --git a/common/Android.mk b/common/Android.mk index 63a4fbb..54db505 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2018 The LineageOS Project +# Copyright (C) 2017-2019 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -40,17 +40,6 @@ LOCAL_DEX_PREOPT := false LOCAL_MODULE_SUFFIX := .apk include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := GoogleExtShared -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/app/GoogleExtShared/GoogleExtShared.apk -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := APPS -LOCAL_DEX_PREOPT := false -LOCAL_MODULE_SUFFIX := .apk -include $(BUILD_PREBUILT) - include $(CLEAR_VARS) LOCAL_MODULE := PrebuiltExchange3Google LOCAL_MODULE_OWNER := gapps @@ -74,18 +63,6 @@ LOCAL_MODULE_SUFFIX := .apk LOCAL_PRIVILEGED_MODULE := true include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := GoogleExtServices -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/GoogleExtServices/GoogleExtServices.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 @@ -98,18 +75,6 @@ LOCAL_MODULE_SUFFIX := .apk LOCAL_PRIVILEGED_MODULE := true include $(BUILD_PREBUILT) -include $(CLEAR_VARS) -LOCAL_MODULE := GoogleOneTimeInitializer -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.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 := GooglePartnerSetup LOCAL_MODULE_OWNER := gapps diff --git a/common/common-vendor.mk b/common/common-vendor.mk index b7de5a2..fbcfe37 100644 --- a/common/common-vendor.mk +++ b/common/common-vendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2018 The LineageOS Project +# Copyright (C) 2017-2019 The LineageOS Project # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -15,21 +15,20 @@ # 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.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 \ vendor/gapps/common/proprietary/etc/sysconfig/google_build.xml:system/etc/sysconfig/google_build.xml PRODUCT_PACKAGES += \ GoogleCalendarSyncAdapter \ GoogleContactsSyncAdapter \ - GoogleExtShared \ PrebuiltExchange3Google \ GoogleBackupTransport \ - GoogleExtServices \ GoogleFeedback \ - GoogleOneTimeInitializer \ GooglePartnerSetup \ GoogleServicesFramework \ Phonesky \ diff --git a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk index ae6c962..61f8b98 100644 Binary files a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ diff --git a/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk b/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk deleted file mode 100644 index 6b39d8b..0000000 Binary files a/common/proprietary/app/GoogleExtShared/GoogleExtShared.apk and /dev/null differ diff --git a/common/proprietary/etc/default-permissions/default-permissions.xml b/common/proprietary/etc/default-permissions/default-permissions.xml new file mode 100644 index 0000000..dcc9c0a --- /dev/null +++ b/common/proprietary/etc/default-permissions/default-permissions.xml @@ -0,0 +1,105 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/proprietary/etc/permissions/privapp-permissions-google.xml b/common/proprietary/etc/permissions/privapp-permissions-google.xml index f3d7fb6..44d6287 100644 --- a/common/proprietary/etc/permissions/privapp-permissions-google.xml +++ b/common/proprietary/etc/permissions/privapp-permissions-google.xml @@ -117,6 +117,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -152,6 +153,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -183,6 +185,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -202,6 +205,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -212,6 +216,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -278,6 +283,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -424,6 +430,7 @@ It allows additional grants on top of privapp-permissions-platform.xml + @@ -457,6 +464,7 @@ 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 new file mode 100644 index 0000000..1721a10 --- /dev/null +++ b/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml @@ -0,0 +1,111 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/proprietary/framework/com.google.android.dialer.support.jar b/common/proprietary/framework/com.google.android.dialer.support.jar index 3057bc4..a180799 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 cafc15a..0371a4f 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/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk b/common/proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk index 9014385..f52cf6a 100644 Binary files a/common/proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk and b/common/proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk differ diff --git a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk index 29498c8..0183c8e 100644 Binary files a/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk and b/common/proprietary/priv-app/GoogleBackupTransport/GoogleBackupTransport.apk differ diff --git a/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk b/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk deleted file mode 100644 index 45553e0..0000000 Binary files a/common/proprietary/priv-app/GoogleExtServices/GoogleExtServices.apk and /dev/null differ diff --git a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk index 63ed8b5..33f3a96 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/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk b/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk deleted file mode 100644 index 32a9d5e..0000000 Binary files a/common/proprietary/priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk and /dev/null differ diff --git a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk index f89807d..2eb1136 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 44418a1..500e0c5 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 1f5ac2a..56963df 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 index 2f3c4e7..1bd0a36 100644 Binary files a/common/proprietary/priv-app/SetupWizard/SetupWizard.apk and b/common/proprietary/priv-app/SetupWizard/SetupWizard.apk differ diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt index cd0f432..cc6c118 100644 --- a/proprietary-files-arm-nongrouper.txt +++ b/proprietary-files-arm-nongrouper.txt @@ -1 +1 @@ --priv-app/Velvet/Velvet.apk;PRESIGNED|6ff0bf464004006754cd333c9d45f471c09b13ce +-priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555 diff --git a/proprietary-files-arm.txt b/proprietary-files-arm.txt index 6b04f14..a805daf 100644 --- a/proprietary-files-arm.txt +++ b/proprietary-files-arm.txt @@ -1,2 +1,2 @@ --priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|25a9ae2decdd4476e2637a9d1e1b838187a6e252 +-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|73caa36e7bc1862ab08eca758542d0d2ea68ed0e lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt index 41243ce..82a268f 100644 --- a/proprietary-files-arm64-nongrouper.txt +++ b/proprietary-files-arm64-nongrouper.txt @@ -1 +1 @@ --priv-app/Velvet/Velvet.apk;PRESIGNED|9e5f9cd8cfc7d28aeed9900548225792cc2a066d +-priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be diff --git a/proprietary-files-arm64.txt b/proprietary-files-arm64.txt index 65d804e..85cfafe 100644 --- a/proprietary-files-arm64.txt +++ b/proprietary-files-arm64.txt @@ -1,3 +1,3 @@ --priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|7f0a4cb87695e3da96faebdf75d92ff59df9d858 +-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|a350146fbbaafc09fa4e5f7b983f918c5ec044a2 lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt index d69993f..94cef06 100644 --- a/proprietary-files-common-nongrouper.txt +++ b/proprietary-files-common-nongrouper.txt @@ -1,2 +1,2 @@ --priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED --priv-app/SetupWizard/SetupWizard.apk;PRESIGNED +-priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc +-priv-app/SetupWizard/SetupWizard.apk;PRESIGNED|cef140e63d5dd861a876b3b24b9e21c82d3749ef diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt index 7b76467..ed9ef8b 100644 --- a/proprietary-files-common.txt +++ b/proprietary-files-common.txt @@ -1,12 +1,9 @@ -app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32 -app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED --app/GoogleExtShared/GoogleExtShared.apk;PRESIGNED -app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2 -priv-app/GoogleBackupTransport/GoogleBackupTransport.apk;PRESIGNED --priv-app/GoogleExtServices/GoogleExtServices.apk;PRESIGNED -priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED --priv-app/GoogleOneTimeInitializer/GoogleOneTimeInitializer.apk;PRESIGNED -priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED -priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED -priv-app/Phonesky/Phonesky.apk;PRESIGNED @@ -14,9 +11,12 @@ -framework/com.google.android.maps.jar;PRESIGNED -framework/com.google.android.dialer.support.jar;PRESIGNED +etc/default-permissions/default-permissions.xml + etc/permissions/com.google.android.maps.xml etc/permissions/com.google.android.dialer.support.xml -etc/permissions/privapp-permissions-google.xml +etc/permissions/privapp-permissions-google.xml|8295b2743b05191eeb7b1992c02a7a59aba338dd +etc/sysconfig/google-hiddenapi-package-whitelist.xml etc/sysconfig/google.xml etc/sysconfig/google_build.xml diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt index f6fe7de..428dd64 100644 --- a/proprietary-files-x86-nongrouper.txt +++ b/proprietary-files-x86-nongrouper.txt @@ -1 +1 @@ --priv-app/Velvet/Velvet.apk;PRESIGNED|d69d0ca0844fe8d794111fa1d836be85a48208c2 +-priv-app/Velvet/Velvet.apk;PRESIGNED|cd13e9ea9d5b3337b8a22b9ea7939132458cbced diff --git a/proprietary-files-x86.txt b/proprietary-files-x86.txt index ea3b5ef..148759e 100644 --- a/proprietary-files-x86.txt +++ b/proprietary-files-x86.txt @@ -1,2 +1,2 @@ --priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|174ac701ac2a5447ed4f9636e02696cada6bf2f6 +-priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|12edbfc7afe880d19c8c897b410e3168c6ad2d73 lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79 diff --git a/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk index a78988e..d37c1f9 100644 Binary files a/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk and b/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk differ diff --git a/x86/proprietary/priv-app/Velvet/Velvet.apk b/x86/proprietary/priv-app/Velvet/Velvet.apk index 10e0f5a..f5eec1a 100644 Binary files a/x86/proprietary/priv-app/Velvet/Velvet.apk and b/x86/proprietary/priv-app/Velvet/Velvet.apk differ