diff --git a/arm/Android.bp b/arm/Android.bp new file mode 100644 index 0000000..775b06d --- /dev/null +++ b/arm/Android.bp @@ -0,0 +1,56 @@ +/** + * Copyright (C) 2019-2021 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. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This file is generated by device/gapps/arm/setup-makefiles.sh + */ + +soong_namespace { +} + +android_app_import { + name: "PrebuiltGmsCore", + owner: "gapps", + apk: "proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "MarkupGoogle", + owner: "gapps", + apk: "proprietary/product/app/MarkupGoogle/MarkupGoogle.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "Velvet", + owner: "gapps", + apk: "proprietary/product/priv-app/Velvet/Velvet.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + diff --git a/arm/Android.mk b/arm/Android.mk index 1547094..3db2a48 100644 --- a/arm/Android.mk +++ b/arm/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,47 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/arm/setup-makefiles.sh LOCAL_PATH := $(call my-dir) -ifneq ($(filter arm,$(TARGET_ARCH)),) - -include $(CLEAR_VARS) -LOCAL_MODULE := PrebuiltGmsCore -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.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) - -ifeq ($(TARGET_IS_GROUPER),) -include $(CLEAR_VARS) -LOCAL_MODULE := MarkupGoogle -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.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 := Velvet -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.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) +ifeq ($(TARGET_ARCH),arm) endif -endif diff --git a/arm/BoardConfigVendor.mk b/arm/BoardConfigVendor.mk index 488d2ea..6e3db58 100644 --- a/arm/BoardConfigVendor.mk +++ b/arm/BoardConfigVendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/arm/setup-makefiles.sh diff --git a/arm/arm-vendor.mk b/arm/arm-vendor.mk index 339a7b9..c56210b 100644 --- a/arm/arm-vendor.mk +++ b/arm/arm-vendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,16 +12,20 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/arm/setup-makefiles.sh + +PRODUCT_SOONG_NAMESPACES += \ + vendor/gapps/arm PRODUCT_COPY_FILES += \ - vendor/gapps/arm/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so + vendor/gapps/arm/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so PRODUCT_PACKAGES += \ PrebuiltGmsCore + ifeq ($(TARGET_IS_GROUPER),) PRODUCT_COPY_FILES += \ - vendor/gapps/arm/proprietary/app/MarkupGoogle/lib/arm/libsketchology_native.so:system/app/MarkupGoogle/lib/arm/libsketchology_native.so + vendor/gapps/arm/proprietary/product/app/MarkupGoogle/lib/arm/libsketchology_native.so:$(TARGET_COPY_OUT_PRODUCT)/app/MarkupGoogle/lib/arm/libsketchology_native.so PRODUCT_PACKAGES += \ MarkupGoogle \ diff --git a/arm/proprietary/app/MarkupGoogle/MarkupGoogle.apk b/arm/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk similarity index 100% rename from arm/proprietary/app/MarkupGoogle/MarkupGoogle.apk rename to arm/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk diff --git a/arm/proprietary/app/MarkupGoogle/lib/arm/libsketchology_native.so b/arm/proprietary/product/app/MarkupGoogle/lib/arm/libsketchology_native.so similarity index 100% rename from arm/proprietary/app/MarkupGoogle/lib/arm/libsketchology_native.so rename to arm/proprietary/product/app/MarkupGoogle/lib/arm/libsketchology_native.so diff --git a/arm/proprietary/lib/libjni_latinimegoogle.so b/arm/proprietary/product/lib/libjni_latinimegoogle.so similarity index 100% rename from arm/proprietary/lib/libjni_latinimegoogle.so rename to arm/proprietary/product/lib/libjni_latinimegoogle.so diff --git a/arm/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/arm/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk similarity index 100% rename from arm/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk rename to arm/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk diff --git a/arm/proprietary/priv-app/Velvet/Velvet.apk b/arm/proprietary/product/priv-app/Velvet/Velvet.apk similarity index 100% rename from arm/proprietary/priv-app/Velvet/Velvet.apk rename to arm/proprietary/product/priv-app/Velvet/Velvet.apk diff --git a/arm64/Android.bp b/arm64/Android.bp new file mode 100644 index 0000000..1df5d41 --- /dev/null +++ b/arm64/Android.bp @@ -0,0 +1,56 @@ +/** + * Copyright (C) 2019-2021 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. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This file is generated by device/gapps/arm64/setup-makefiles.sh + */ + +soong_namespace { +} + +android_app_import { + name: "PrebuiltGmsCore", + owner: "gapps", + apk: "proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "MarkupGoogle", + owner: "gapps", + apk: "proprietary/product/app/MarkupGoogle/MarkupGoogle.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "Velvet", + owner: "gapps", + apk: "proprietary/product/priv-app/Velvet/Velvet.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + diff --git a/arm64/Android.mk b/arm64/Android.mk index b410af4..9529c81 100644 --- a/arm64/Android.mk +++ b/arm64/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,47 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/arm64/setup-makefiles.sh LOCAL_PATH := $(call my-dir) -ifneq ($(filter arm64,$(TARGET_ARCH)),) - -include $(CLEAR_VARS) -LOCAL_MODULE := PrebuiltGmsCore -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.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) - -ifeq ($(TARGET_IS_GROUPER),) -include $(CLEAR_VARS) -LOCAL_MODULE := MarkupGoogle -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/app/MarkupGoogle/MarkupGoogle.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 := Velvet -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.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) +ifeq ($(TARGET_ARCH),arm64) endif -endif diff --git a/arm64/BoardConfigVendor.mk b/arm64/BoardConfigVendor.mk index 488d2ea..a5a2e11 100644 --- a/arm64/BoardConfigVendor.mk +++ b/arm64/BoardConfigVendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/arm64/setup-makefiles.sh diff --git a/arm64/arm64-vendor.mk b/arm64/arm64-vendor.mk index 771f87b..67f81a2 100644 --- a/arm64/arm64-vendor.mk +++ b/arm64/arm64-vendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,17 +12,21 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/arm64/setup-makefiles.sh + +PRODUCT_SOONG_NAMESPACES += \ + vendor/gapps/arm64 PRODUCT_COPY_FILES += \ - vendor/gapps/arm64/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so \ - vendor/gapps/arm64/proprietary/lib64/libjni_latinimegoogle.so:system/lib64/libjni_latinimegoogle.so + vendor/gapps/arm64/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so \ + vendor/gapps/arm64/proprietary/product/lib64/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib64/libjni_latinimegoogle.so PRODUCT_PACKAGES += \ PrebuiltGmsCore + ifeq ($(TARGET_IS_GROUPER),) PRODUCT_COPY_FILES += \ - vendor/gapps/arm64/proprietary/app/MarkupGoogle/lib/arm64/libsketchology_native.so:system/app/MarkupGoogle/lib/arm64/libsketchology_native.so + vendor/gapps/arm64/proprietary/product/app/MarkupGoogle/lib/arm64/libsketchology_native.so:$(TARGET_COPY_OUT_PRODUCT)/app/MarkupGoogle/lib/arm64/libsketchology_native.so PRODUCT_PACKAGES += \ MarkupGoogle \ diff --git a/arm64/proprietary/app/MarkupGoogle/MarkupGoogle.apk b/arm64/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk similarity index 100% rename from arm64/proprietary/app/MarkupGoogle/MarkupGoogle.apk rename to arm64/proprietary/product/app/MarkupGoogle/MarkupGoogle.apk diff --git a/arm64/proprietary/app/MarkupGoogle/lib/arm64/libsketchology_native.so b/arm64/proprietary/product/app/MarkupGoogle/lib/arm64/libsketchology_native.so similarity index 100% rename from arm64/proprietary/app/MarkupGoogle/lib/arm64/libsketchology_native.so rename to arm64/proprietary/product/app/MarkupGoogle/lib/arm64/libsketchology_native.so diff --git a/arm64/proprietary/lib/libjni_latinimegoogle.so b/arm64/proprietary/product/lib/libjni_latinimegoogle.so similarity index 100% rename from arm64/proprietary/lib/libjni_latinimegoogle.so rename to arm64/proprietary/product/lib/libjni_latinimegoogle.so diff --git a/arm64/proprietary/lib64/libjni_latinimegoogle.so b/arm64/proprietary/product/lib64/libjni_latinimegoogle.so similarity index 100% rename from arm64/proprietary/lib64/libjni_latinimegoogle.so rename to arm64/proprietary/product/lib64/libjni_latinimegoogle.so diff --git a/arm64/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/arm64/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk similarity index 100% rename from arm64/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk rename to arm64/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk diff --git a/arm64/proprietary/priv-app/Velvet/Velvet.apk b/arm64/proprietary/product/priv-app/Velvet/Velvet.apk similarity index 100% rename from arm64/proprietary/priv-app/Velvet/Velvet.apk rename to arm64/proprietary/product/priv-app/Velvet/Velvet.apk diff --git a/build/gapps.sh b/build/gapps.sh index 2795f0a..2b2eb63 100755 --- a/build/gapps.sh +++ b/build/gapps.sh @@ -8,7 +8,7 @@ # DATE=$(date -u +%Y%m%d_%H%M%S) TOP=$(realpath .) -ANDROIDV=9.0.0 +ANDROIDV=11.0.0 GARCH=$1 OUT=$TOP/out BUILD=$TOP/build diff --git a/build/meta/com/google/android/update-binary b/build/meta/com/google/android/update-binary index c78a1d3..cd5dfbe 100644 --- a/build/meta/com/google/android/update-binary +++ b/build/meta/com/google/android/update-binary @@ -93,10 +93,10 @@ NEEDED_STORAGE=`expr $(exec_util "du -s ." | awk '{ print $1 }') + $STORAGE_BUFF if [ "$MEM" -lt "$LOWMEM" ] || [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then ui_print "Low resource device detected, removing large extras" - exec_util "rm -rf app/MarkupGoogle" - exec_util "rm -rf priv-app/AndroidMigratePrebuilt" - exec_util "rm -rf priv-app/SetupWizard" - exec_util "rm -rf priv-app/Velvet" + exec_util "rm -rf product/app/MarkupGoogle" + exec_util "rm -rf product/priv-app/AndroidMigratePrebuilt" + exec_util "rm -rf product/priv-app/SetupWizardPrebuilt" + exec_util "rm -rf product/priv-app/Velvet" NEEDED_STORAGE=`expr $(exec_util "du -s ." | awk '{ print $1 }') + $STORAGE_BUFFER` if [ "$STORAGE" -lt "$NEEDED_STORAGE" ]; then ui_print "Not enough space for GApps! Aborting" @@ -136,7 +136,7 @@ done ui_print "Copying files" exec_util "cp --preserve=a -r ./* /system/" if [ -e priv-app/SetupWizard ] ; then - exec_util "rm -rf /system/priv-app/Provision" + exec_util "rm -rf /system/system_ext/priv-app/Provision" fi ui_print "Cleaning up files" cd ../ diff --git a/common/Android.bp b/common/Android.bp new file mode 100644 index 0000000..3ed40df --- /dev/null +++ b/common/Android.bp @@ -0,0 +1,146 @@ +/** + * Copyright (C) 2019-2021 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. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This file is generated by device/gapps/common/setup-makefiles.sh + */ + +soong_namespace { +} + +android_app_import { + name: "GoogleCalendarSyncAdapter", + owner: "gapps", + apk: "proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "GoogleContactsSyncAdapter", + owner: "gapps", + apk: "proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "PrebuiltExchange3Google", + owner: "gapps", + apk: "proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + product_specific: true, +} + +android_app_import { + name: "AndroidAutoStubPrebuilt", + owner: "gapps", + apk: "proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "PartnerSetupPrebuilt", + owner: "gapps", + apk: "proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "Phonesky", + owner: "gapps", + apk: "proprietary/product/priv-app/Phonesky/Phonesky.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "GoogleFeedback", + owner: "gapps", + apk: "proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + +android_app_import { + name: "GoogleServicesFramework", + owner: "gapps", + apk: "proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + system_ext_specific: true, +} + +dex_import { + name: "com.google.android.dialer.support", + owner: "gapps", + jars: ["proprietary/product/framework/com.google.android.dialer.support.jar"], + product_specific: true, +} + +android_app_import { + name: "AndroidMigratePrebuilt", + owner: "gapps", + apk: "proprietary/product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "SetupWizardPrebuilt", + owner: "gapps", + apk: "proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk", + overrides: ["Provision"], + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + diff --git a/common/Android.mk b/common/Android.mk index df9da0e..7619c16 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,138 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/common/setup-makefiles.sh LOCAL_PATH := $(call my-dir) ifneq ($(filter arm arm64 x86,$(TARGET_ARCH)),) -include $(CLEAR_VARS) -LOCAL_MODULE := GoogleCalendarSyncAdapter -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.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 := GoogleContactsSyncAdapter -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.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 -LOCAL_SRC_FILES := proprietary/app/PrebuiltExchange3Google/PrebuiltExchange3Google.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 := GoogleFeedback -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/GoogleFeedback/GoogleFeedback.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 -LOCAL_SRC_FILES := proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.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 := GoogleServicesFramework -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.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 := Phonesky -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/Phonesky/Phonesky.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 := com.google.android.dialer.support -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/framework/com.google.android.dialer.support.jar -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_SUFFIX := .jar -include $(BUILD_PREBUILT) - -include $(CLEAR_VARS) -LOCAL_MODULE := com.google.android.maps -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/framework/com.google.android.maps.jar -LOCAL_CERTIFICATE := PRESIGNED -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE_CLASS := JAVA_LIBRARIES -LOCAL_MODULE_SUFFIX := .jar -include $(BUILD_PREBUILT) - -ifeq ($(TARGET_IS_GROUPER),) -include $(CLEAR_VARS) -LOCAL_MODULE := AndroidMigratePrebuilt -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.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 := SetupWizardPrebuilt -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk -LOCAL_OVERRIDES_PACKAGES := Provision -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) - -endif endif diff --git a/common/BoardConfigVendor.mk b/common/BoardConfigVendor.mk index 488d2ea..1ba2603 100644 --- a/common/BoardConfigVendor.mk +++ b/common/BoardConfigVendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/common/setup-makefiles.sh diff --git a/common/common-vendor.mk b/common/common-vendor.mk index 0acbf36..e15db35 100644 --- a/common/common-vendor.mk +++ b/common/common-vendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,28 +12,30 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/common/setup-makefiles.sh + +PRODUCT_SOONG_NAMESPACES += \ + vendor/gapps/common PRODUCT_COPY_FILES += \ - 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 \ - vendor/gapps/common/proprietary/etc/sysconfig/google_build.xml:system/etc/sysconfig/google_build.xml + vendor/gapps/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/com.google.android.dialer.support.xml \ + vendor/gapps/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/permissions/privapp-permissions-google-p.xml \ + vendor/gapps/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google-hiddenapi-package-whitelist.xml \ + vendor/gapps/common/proprietary/product/etc/sysconfig/google.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google.xml \ + vendor/gapps/common/proprietary/product/etc/sysconfig/google_build.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/sysconfig/google_build.xml \ + vendor/gapps/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml:$(TARGET_COPY_OUT_SYSTEM_EXT)/etc/permissions/privapp-permissions-google-se.xml PRODUCT_PACKAGES += \ GoogleCalendarSyncAdapter \ GoogleContactsSyncAdapter \ PrebuiltExchange3Google \ - GoogleFeedback \ - GooglePartnerSetup \ - GoogleServicesFramework \ + AndroidAutoStubPrebuilt \ + PartnerSetupPrebuilt \ Phonesky \ - com.google.android.dialer.support \ - com.google.android.maps + GoogleFeedback \ + GoogleServicesFramework \ + com.google.android.dialer.support + ifeq ($(TARGET_IS_GROUPER),) PRODUCT_PACKAGES += \ diff --git a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk deleted file mode 100644 index 9ea0f4e..0000000 Binary files a/common/proprietary/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk and /dev/null differ diff --git a/common/proprietary/etc/permissions/com.google.android.maps.xml b/common/proprietary/etc/permissions/com.google.android.maps.xml deleted file mode 100644 index 1f68365..0000000 --- a/common/proprietary/etc/permissions/com.google.android.maps.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - diff --git a/common/proprietary/etc/permissions/privapp-permissions-google-p.xml b/common/proprietary/etc/permissions/privapp-permissions-google-p.xml deleted file mode 100644 index f2cedad..0000000 --- a/common/proprietary/etc/permissions/privapp-permissions-google-p.xml +++ /dev/null @@ -1,308 +0,0 @@ - - - - - - - - - - - - - . - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/proprietary/etc/permissions/privapp-permissions-google.xml b/common/proprietary/etc/permissions/privapp-permissions-google.xml deleted file mode 100644 index 3c3b4d7..0000000 --- a/common/proprietary/etc/permissions/privapp-permissions-google.xml +++ /dev/null @@ -1,82 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/proprietary/framework/com.google.android.dialer.support.jar b/common/proprietary/framework/com.google.android.dialer.support.jar deleted file mode 100644 index 57faecd..0000000 Binary files a/common/proprietary/framework/com.google.android.dialer.support.jar and /dev/null differ diff --git a/common/proprietary/framework/com.google.android.maps.jar b/common/proprietary/framework/com.google.android.maps.jar deleted file mode 100644 index 0f2ebaf..0000000 Binary files a/common/proprietary/framework/com.google.android.maps.jar and /dev/null differ diff --git a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk deleted file mode 100644 index c82bfa0..0000000 Binary files a/common/proprietary/priv-app/GoogleFeedback/GoogleFeedback.apk and /dev/null differ diff --git a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk b/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk deleted file mode 100644 index 3083f2b..0000000 Binary files a/common/proprietary/priv-app/GooglePartnerSetup/GooglePartnerSetup.apk and /dev/null differ diff --git a/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk b/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk deleted file mode 100644 index 0043e80..0000000 Binary files a/common/proprietary/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk and /dev/null differ diff --git a/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk deleted file mode 100644 index 3ea8c76..0000000 Binary files a/common/proprietary/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk and /dev/null differ diff --git a/common/proprietary/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk b/common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk similarity index 100% rename from common/proprietary/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk rename to common/proprietary/product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk diff --git a/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk b/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk new file mode 100644 index 0000000..f21ca27 Binary files /dev/null and b/common/proprietary/product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk differ diff --git a/common/proprietary/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk b/common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk similarity index 100% rename from common/proprietary/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk rename to common/proprietary/product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk diff --git a/common/proprietary/etc/permissions/com.google.android.dialer.support.xml b/common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml similarity index 100% rename from common/proprietary/etc/permissions/com.google.android.dialer.support.xml rename to common/proprietary/product/etc/permissions/com.google.android.dialer.support.xml diff --git a/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml b/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml similarity index 58% rename from common/proprietary/etc/permissions/privapp-permissions-google-ps.xml rename to common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml index 90ccf11..0f79927 100644 --- a/common/proprietary/etc/permissions/privapp-permissions-google-ps.xml +++ b/common/proprietary/product/etc/permissions/privapp-permissions-google-p.xml @@ -17,21 +17,214 @@ - - + + - - + + - - + + + . + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -50,6 +243,8 @@ It allows additional grants on top of privapp-permissions-platform.xml + + @@ -77,16 +272,22 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + + + + @@ -96,13 +297,17 @@ It allows additional grants on top of privapp-permissions-platform.xml - + + + + + @@ -142,6 +347,8 @@ It allows additional grants on top of privapp-permissions-platform.xml + + @@ -190,10 +397,13 @@ It allows additional grants on top of privapp-permissions-platform.xml + + + @@ -202,7 +412,6 @@ It allows additional grants on top of privapp-permissions-platform.xml - @@ -212,15 +421,16 @@ It allows additional grants on top of privapp-permissions-platform.xml - + + - + @@ -235,40 +445,8 @@ It allows additional grants on top of privapp-permissions-platform.xml + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -288,17 +466,18 @@ It allows additional grants on top of privapp-permissions-platform.xml - + + @@ -309,4 +488,20 @@ 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/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml similarity index 97% rename from common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml rename to common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml index 0a131a9..0e2c304 100644 --- a/common/proprietary/etc/sysconfig/google-hiddenapi-package-whitelist.xml +++ b/common/proprietary/product/etc/sysconfig/google-hiddenapi-package-whitelist.xml @@ -22,6 +22,7 @@ This XML file declares which platform apps that need to access internal APIs. + @@ -53,7 +54,6 @@ This XML file declares which platform apps that need to access internal APIs. - @@ -87,7 +87,6 @@ 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/product/etc/sysconfig/google.xml similarity index 89% rename from common/proprietary/etc/sysconfig/google.xml rename to common/proprietary/product/etc/sysconfig/google.xml index 57c6aa6..aa63d06 100644 --- a/common/proprietary/etc/sysconfig/google.xml +++ b/common/proprietary/product/etc/sysconfig/google.xml @@ -48,6 +48,9 @@ + + + @@ -62,7 +65,7 @@ - + @@ -73,6 +76,7 @@ + @@ -97,10 +101,17 @@ + - - + + + + + + + diff --git a/common/proprietary/etc/sysconfig/google_build.xml b/common/proprietary/product/etc/sysconfig/google_build.xml similarity index 100% rename from common/proprietary/etc/sysconfig/google_build.xml rename to common/proprietary/product/etc/sysconfig/google_build.xml diff --git a/common/proprietary/product/framework/com.google.android.dialer.support.jar b/common/proprietary/product/framework/com.google.android.dialer.support.jar new file mode 100644 index 0000000..85cd574 Binary files /dev/null and b/common/proprietary/product/framework/com.google.android.dialer.support.jar differ diff --git a/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk b/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk new file mode 100644 index 0000000..f8dc784 Binary files /dev/null and b/common/proprietary/product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk differ diff --git a/common/proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk b/common/proprietary/product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk similarity index 100% rename from common/proprietary/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk rename to common/proprietary/product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk diff --git a/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk b/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk new file mode 100644 index 0000000..a7a05d1 Binary files /dev/null and b/common/proprietary/product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk differ diff --git a/common/proprietary/priv-app/Phonesky/Phonesky.apk b/common/proprietary/product/priv-app/Phonesky/Phonesky.apk similarity index 70% rename from common/proprietary/priv-app/Phonesky/Phonesky.apk rename to common/proprietary/product/priv-app/Phonesky/Phonesky.apk index a9ed633..2faa264 100644 Binary files a/common/proprietary/priv-app/Phonesky/Phonesky.apk and b/common/proprietary/product/priv-app/Phonesky/Phonesky.apk differ diff --git a/common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk b/common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk new file mode 100644 index 0000000..2208728 Binary files /dev/null and b/common/proprietary/product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk differ diff --git a/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml new file mode 100644 index 0000000..7797166 --- /dev/null +++ b/common/proprietary/system_ext/etc/permissions/privapp-permissions-google-se.xml @@ -0,0 +1,206 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk b/common/proprietary/system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk new file mode 100644 index 0000000..3dfb684 Binary files /dev/null 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 new file mode 100644 index 0000000..02d2b15 Binary files /dev/null and b/common/proprietary/system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk differ diff --git a/proprietary-files-arm-nongrouper.txt b/proprietary-files-arm-nongrouper.txt index 0b4494a..de32c90 100644 --- a/proprietary-files-arm-nongrouper.txt +++ b/proprietary-files-arm-nongrouper.txt @@ -1,3 +1,3 @@ --app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f --priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555 -app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db +-product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f +-product/priv-app/Velvet/Velvet.apk;PRESIGNED|1bd57d7a32d77ec007ca7ad8032cca8d9038c555 +product/app/MarkupGoogle/lib/arm/libsketchology_native.so|479720ba394500786e5b5a39deb09a93d5bce9db diff --git a/proprietary-files-arm.txt b/proprietary-files-arm.txt index 6ec1644..7591bd2 100644 --- a/proprietary-files-arm.txt +++ b/proprietary-files-arm.txt @@ -1,2 +1,2 @@ --priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|afd195a1ea4578b353ae03c78488c98151207fec -lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e +-product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|afd195a1ea4578b353ae03c78488c98151207fec +product/lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e diff --git a/proprietary-files-arm64-nongrouper.txt b/proprietary-files-arm64-nongrouper.txt index 48ccd0d..31a5248 100644 --- a/proprietary-files-arm64-nongrouper.txt +++ b/proprietary-files-arm64-nongrouper.txt @@ -1,3 +1,3 @@ --app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f --priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be -app/MarkupGoogle/lib/arm64/libsketchology_native.so|71898873b8d07af8f0589ac6faf64770300b2e21 +-product/app/MarkupGoogle/MarkupGoogle.apk;PRESIGNED|012bf4c0622d9d0aa4361a62e7ce07a1eb056b8f +-product/priv-app/Velvet/Velvet.apk;PRESIGNED|314043242c4253b61d9d4fcf656489d3fa0265be +product/app/MarkupGoogle/lib/arm64/libsketchology_native.so|5c55b4d32beeeca04b4e9f4ce1a2cd3e15a32c8c diff --git a/proprietary-files-arm64.txt b/proprietary-files-arm64.txt index 61e3fd8..839776b 100644 --- a/proprietary-files-arm64.txt +++ b/proprietary-files-arm64.txt @@ -1,3 +1,3 @@ --priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|490ad9c4c40d81159d7b56499acc8bdcc0d195af -lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e -lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d +-product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|490ad9c4c40d81159d7b56499acc8bdcc0d195af +product/lib/libjni_latinimegoogle.so|2eba28b0bc56c44aa89749cb4e2423068b9fcd4e +product/lib64/libjni_latinimegoogle.so|84f9b1dc4c1b45f0c5ec9043b99a50c54e58ae1d diff --git a/proprietary-files-common-nongrouper.txt b/proprietary-files-common-nongrouper.txt index c28bcd8..144c0ea 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/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED +-product/priv-app/AndroidMigratePrebuilt/AndroidMigratePrebuilt.apk;PRESIGNED|eb965010832814a84afc32db11bf1c89586b78bc +-product/priv-app/SetupWizardPrebuilt/SetupWizardPrebuilt.apk;PRESIGNED diff --git a/proprietary-files-common.txt b/proprietary-files-common.txt index 94476e3..94f9e85 100644 --- a/proprietary-files-common.txt +++ b/proprietary-files-common.txt @@ -1,21 +1,21 @@ --app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32 --app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED --app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2 +-product/app/GoogleCalendarSyncAdapter/GoogleCalendarSyncAdapter.apk;PRESIGNED|aa482580c87a43c83882c05a4757754917d47f32 +-product/app/GoogleContactsSyncAdapter/GoogleContactsSyncAdapter.apk;PRESIGNED +-product/app/PrebuiltExchange3Google/PrebuiltExchange3Google.apk;PRESIGNED|043cb74798bf137d2dd1a69c7bca0a6702ad88a2 --priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED --priv-app/GooglePartnerSetup/GooglePartnerSetup.apk;PRESIGNED --priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED --priv-app/Phonesky/Phonesky.apk;PRESIGNED +-product/priv-app/AndroidAutoStubPrebuilt/AndroidAutoStubPrebuilt.apk;PRESIGNED +-product/priv-app/PartnerSetupPrebuilt/PartnerSetupPrebuilt.apk;PRESIGNED +-product/priv-app/Phonesky/Phonesky.apk;PRESIGNED --framework/com.google.android.maps.jar;PRESIGNED --framework/com.google.android.dialer.support.jar;PRESIGNED +-product/framework/com.google.android.dialer.support.jar;PRESIGNED -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-p.xml -etc/permissions/privapp-permissions-google-ps.xml +product/etc/permissions/com.google.android.dialer.support.xml +product/etc/permissions/privapp-permissions-google-p.xml -etc/sysconfig/google-hiddenapi-package-whitelist.xml -etc/sysconfig/google.xml -etc/sysconfig/google_build.xml +product/etc/sysconfig/google-hiddenapi-package-whitelist.xml +product/etc/sysconfig/google.xml +product/etc/sysconfig/google_build.xml + +-system_ext/priv-app/GoogleFeedback/GoogleFeedback.apk;PRESIGNED +-system_ext/priv-app/GoogleServicesFramework/GoogleServicesFramework.apk;PRESIGNED + +system_ext/etc/permissions/privapp-permissions-google-se.xml diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt index 428dd64..0a54d53 100644 --- a/proprietary-files-x86-nongrouper.txt +++ b/proprietary-files-x86-nongrouper.txt @@ -1 +1 @@ --priv-app/Velvet/Velvet.apk;PRESIGNED|cd13e9ea9d5b3337b8a22b9ea7939132458cbced +-product/priv-app/Velvet/Velvet.apk;PRESIGNED|cd13e9ea9d5b3337b8a22b9ea7939132458cbced diff --git a/proprietary-files-x86.txt b/proprietary-files-x86.txt index c5587d1..c34c60b 100644 --- a/proprietary-files-x86.txt +++ b/proprietary-files-x86.txt @@ -1,2 +1,2 @@ --priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|e3963b9548dc8b50674a11b937c9af6e00c652e6 -lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79 +-product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk;PRESIGNED|e3963b9548dc8b50674a11b937c9af6e00c652e6 +product/lib/libjni_latinimegoogle.so|5e1e142c1ff8dcd97c9574f90d613c878bde0e79 diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 7736e22..0cacb68 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -20,7 +20,7 @@ set -e export INITIAL_COPYRIGHT_YEAR=2017 -export GAPPS_COMMON=common +export DEVICE_COMMON=common export VENDOR=gapps # Load extract_utils and do some sanity checks @@ -37,7 +37,7 @@ fi . "$HELPER" # Initialize the helper for common gapps -setup_vendor "$GAPPS_COMMON" "$VENDOR" "$LINEAGE_ROOT" true +setup_vendor "$DEVICE_COMMON" "$VENDOR" "$LINEAGE_ROOT" true # Copyright headers write_headers "arm arm64 x86" @@ -46,36 +46,34 @@ write_headers "arm arm64 x86" write_makefiles "$MY_DIR"/proprietary-files-common.txt # Gapps that are too large for grouper +printf "\n" >> "$PRODUCTMK" echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK" -echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK" write_makefiles "$MY_DIR"/proprietary-files-common-nongrouper.txt echo "endif" >> "$PRODUCTMK" -echo "endif" >> "$ANDROIDMK" sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK" # Make Google SuW override Provision -sed -i 's/\(SetupWizardPrebuilt.apk\)/\1\nLOCAL_OVERRIDES_PACKAGES := Provision/' "$ANDROIDMK" +sed -i 's/\(SetupWizardPrebuilt.apk",\)/\1\n\toverrides: ["Provision"],/' "$ANDROIDBP" # We are done with common write_footers -for TARGET in arm arm64 x86; do +for DEVICE in arm arm64 x86; do # Reinitialize the helper for target gapps -setup_vendor "$TARGET" "$VENDOR" "$LINEAGE_ROOT" true +setup_vendor "$DEVICE" "$VENDOR" "$LINEAGE_ROOT" # Copyright headers and guards -write_headers "$TARGET" +write_headers "$DEVICE" -write_makefiles "$MY_DIR"/proprietary-files-$TARGET.txt +write_makefiles "$MY_DIR"/proprietary-files-$DEVICE.txt # Gapps that are too large for grouper +printf "\n" >> "$PRODUCTMK" echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$PRODUCTMK" -echo "ifeq (\$(TARGET_IS_GROUPER),)" >> "$ANDROIDMK" -write_makefiles "$MY_DIR"/proprietary-files-$TARGET-nongrouper.txt +write_makefiles "$MY_DIR"/proprietary-files-$DEVICE-nongrouper.txt echo "endif" >> "$PRODUCTMK" -echo "endif" >> "$ANDROIDMK" printf '\n%s\n' "\$(call inherit-product, vendor/gapps/common/common-vendor.mk)" >> "$PRODUCTMK" diff --git a/x86/Android.bp b/x86/Android.bp new file mode 100644 index 0000000..403017c --- /dev/null +++ b/x86/Android.bp @@ -0,0 +1,45 @@ +/** + * Copyright (C) 2019-2021 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. + * 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. + * See the License for the specific language governing permissions and + * limitations under the License. + * + * This file is generated by device/gapps/x86/setup-makefiles.sh + */ + +soong_namespace { +} + +android_app_import { + name: "PrebuiltGmsCore", + owner: "gapps", + apk: "proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + +android_app_import { + name: "Velvet", + owner: "gapps", + apk: "proprietary/product/priv-app/Velvet/Velvet.apk", + presigned: true, + dex_preopt: { + enabled: false, + }, + privileged: true, + product_specific: true, +} + diff --git a/x86/Android.mk b/x86/Android.mk index fd2a5ab..0183375 100644 --- a/x86/Android.mk +++ b/x86/Android.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,36 +12,10 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/x86/setup-makefiles.sh LOCAL_PATH := $(call my-dir) -ifneq ($(filter x86,$(TARGET_ARCH)),) - -include $(CLEAR_VARS) -LOCAL_MODULE := PrebuiltGmsCore -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.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) - -ifeq ($(TARGET_IS_GROUPER),) -include $(CLEAR_VARS) -LOCAL_MODULE := Velvet -LOCAL_MODULE_OWNER := gapps -LOCAL_SRC_FILES := proprietary/priv-app/Velvet/Velvet.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) +ifeq ($(TARGET_ARCH),x86) endif -endif diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk index 488d2ea..b4d8efb 100644 --- a/x86/BoardConfigVendor.mk +++ b/x86/BoardConfigVendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,5 +12,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/x86/setup-makefiles.sh diff --git a/x86/proprietary/lib/libjni_latinimegoogle.so b/x86/proprietary/product/lib/libjni_latinimegoogle.so similarity index 100% rename from x86/proprietary/lib/libjni_latinimegoogle.so rename to x86/proprietary/product/lib/libjni_latinimegoogle.so diff --git a/x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk b/x86/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk similarity index 100% rename from x86/proprietary/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk rename to x86/proprietary/product/priv-app/PrebuiltGmsCore/PrebuiltGmsCore.apk diff --git a/x86/proprietary/priv-app/Velvet/Velvet.apk b/x86/proprietary/product/priv-app/Velvet/Velvet.apk similarity index 100% rename from x86/proprietary/priv-app/Velvet/Velvet.apk rename to x86/proprietary/product/priv-app/Velvet/Velvet.apk diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk index da8ecf3..bea8042 100644 --- a/x86/x86-vendor.mk +++ b/x86/x86-vendor.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2017-2019 The LineageOS Project +# Copyright (C) 2017-2021 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. @@ -12,13 +12,17 @@ # See the License for the specific language governing permissions and # limitations under the License. -# This file is generated by device/gapps//setup-makefiles.sh +# This file is generated by device/gapps/x86/setup-makefiles.sh + +PRODUCT_SOONG_NAMESPACES += \ + vendor/gapps/x86 PRODUCT_COPY_FILES += \ - vendor/gapps/x86/proprietary/lib/libjni_latinimegoogle.so:system/lib/libjni_latinimegoogle.so + vendor/gapps/x86/proprietary/product/lib/libjni_latinimegoogle.so:$(TARGET_COPY_OUT_PRODUCT)/lib/libjni_latinimegoogle.so PRODUCT_PACKAGES += \ PrebuiltGmsCore + ifeq ($(TARGET_IS_GROUPER),) PRODUCT_PACKAGES += \