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..bc1010a 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. @@ -24,12 +24,9 @@ PRODUCT_COPY_FILES += \ PRODUCT_PACKAGES += \ GoogleCalendarSyncAdapter \ GoogleContactsSyncAdapter \ - GoogleExtShared \ PrebuiltExchange3Google \ GoogleBackupTransport \ - GoogleExtServices \ GoogleFeedback \ - GoogleOneTimeInitializer \ GooglePartnerSetup \ GoogleServicesFramework \ Phonesky \ 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/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/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/proprietary-files-common.txt b/proprietary-files-common.txt index 7b76467..022e19c 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