diff --git a/README.md b/README.md index f26a458..3600ecb 100644 --- a/README.md +++ b/README.md @@ -16,16 +16,13 @@ _make gapps_arm_ _make gapps_arm64_ - compile signed flashable GApps for arm64 -_make gapps_x86_ -- compile signed flashable GApps for x86 - _make gapps_x86_64_ - compile signed flashable GApps for x86_64 Build inline with Android ------------------- 1. Sync this repo to `$GAPPS_PATH` where `$GAPPS_PATH` is the path to this repo -2. Include `$GAPPS_PATH/$ARCH/$ARCH-vendor.mk` where `$ARCH` is arm, arm64, x86, or x86_64 depending on the device's architecture +2. Include `$GAPPS_PATH/$ARCH/$ARCH-vendor.mk` where `$ARCH` is arm, arm64, or x86_64 depending on the device's architecture Explanation of pinned blobs ------------------- diff --git a/build/main.mk b/build/main.mk index 441f290..b86483e 100644 --- a/build/main.mk +++ b/build/main.mk @@ -17,10 +17,6 @@ gapps_arm64: @echo "Compiling GApps for arm64..." @bash $(BUILD_GAPPS) arm64 2>&1 -gapps_x86: - @echo "Compiling GApps for x86..." - @bash $(BUILD_GAPPS) x86 2>&1 - gapps_x86_64: @echo "Compiling GApps for x86_64..." @bash $(BUILD_GAPPS) x86_64 2>&1 diff --git a/common/Android.mk b/common/Android.mk index d33e589..24cade8 100644 --- a/common/Android.mk +++ b/common/Android.mk @@ -4,6 +4,6 @@ LOCAL_PATH := $(call my-dir) -ifneq ($(filter arm arm64 x86 x86_64,$(TARGET_ARCH)),) +ifneq ($(filter arm arm64 x86_64,$(TARGET_ARCH)),) endif diff --git a/proprietary-files-x86-nongrouper.txt b/proprietary-files-x86-nongrouper.txt deleted file mode 100644 index 9aef55c..0000000 --- a/proprietary-files-x86-nongrouper.txt +++ /dev/null @@ -1,3 +0,0 @@ -product/priv-app/Velvet/Velvet.apk;PRESIGNED - -system_ext/priv-app/SetupWizard/SetupWizard.apk;OVERRIDES=Provision;PRESIGNED diff --git a/proprietary-files-x86.txt b/proprietary-files-x86.txt deleted file mode 100644 index 8dad7f4..0000000 --- a/proprietary-files-x86.txt +++ /dev/null @@ -1,3 +0,0 @@ -product/priv-app/GmsCore/GmsCore.apk;PRESIGNED -product/priv-app/Phonesky/Phonesky.apk;PRESIGNED -product/lib/libjni_latinimegoogle.so|40e731390e8372196db987b1d7fd83c204b42e41 diff --git a/setup-makefiles.sh b/setup-makefiles.sh index 34d1c09..8435947 100755 --- a/setup-makefiles.sh +++ b/setup-makefiles.sh @@ -40,7 +40,7 @@ fi setup_vendor "$DEVICE_COMMON" "$VENDOR" "$ANDROID_ROOT" true # Copyright headers -write_headers "arm arm64 x86 x86_64" +write_headers "arm arm64 x86_64" # Common gapps write_makefiles "$MY_DIR"/proprietary-files-common.txt @@ -65,7 +65,7 @@ sed -i 's/TARGET_DEVICE/TARGET_ARCH/g' "$ANDROIDMK" # We are done with common write_footers -for DEVICE in arm arm64 x86 x86_64; do +for DEVICE in arm arm64 x86_64; do # Reinitialize the helper for target gapps setup_vendor "$DEVICE" "$VENDOR" "$ANDROID_ROOT" diff --git a/x86/Android.bp b/x86/Android.bp deleted file mode 100644 index e9fa0c8..0000000 --- a/x86/Android.bp +++ /dev/null @@ -1,80 +0,0 @@ -// Automatically generated file. DO NOT MODIFY -// -// This file is generated by device/gapps/x86/setup-makefiles.sh - -soong_namespace { - imports: [ - "vendor/gapps/common", - ], -} - -cc_prebuilt_library_shared { - name: "libjni_latinimegoogle", - owner: "gapps", - strip: { - none: true, - }, - target: { - android_x86: { - srcs: ["proprietary/product/lib/libjni_latinimegoogle.so"], - shared_libs: ["libc", "libc++", "libm", "libdl", ], - }, - }, - compile_multilib: "32", - prefer: true, - product_specific: true, -} - -android_app_import { - name: "GmsCore", - owner: "gapps", - apk: "proprietary/product/priv-app/GmsCore/GmsCore.apk", - preprocessed: true, - 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", - preprocessed: true, - 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", - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - product_specific: true, -} - -android_app_import { - name: "SetupWizard", - owner: "gapps", - apk: "proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk", - overrides: ["Provision"], - preprocessed: true, - presigned: true, - dex_preopt: { - enabled: false, - }, - privileged: true, - system_ext_specific: true, -} - diff --git a/x86/Android.mk b/x86/Android.mk deleted file mode 100644 index 11c7a3b..0000000 --- a/x86/Android.mk +++ /dev/null @@ -1,9 +0,0 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/x86/setup-makefiles.sh - -LOCAL_PATH := $(call my-dir) - -ifeq ($(TARGET_ARCH),x86) - -endif diff --git a/x86/BoardConfigVendor.mk b/x86/BoardConfigVendor.mk deleted file mode 100644 index fe7a4f8..0000000 --- a/x86/BoardConfigVendor.mk +++ /dev/null @@ -1,4 +0,0 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/x86/setup-makefiles.sh - diff --git a/x86/proprietary/product/lib/libjni_latinimegoogle.so b/x86/proprietary/product/lib/libjni_latinimegoogle.so deleted file mode 100755 index 13baa88..0000000 Binary files a/x86/proprietary/product/lib/libjni_latinimegoogle.so and /dev/null differ diff --git a/x86/proprietary/product/priv-app/GmsCore/GmsCore.apk b/x86/proprietary/product/priv-app/GmsCore/GmsCore.apk deleted file mode 100644 index 290495b..0000000 Binary files a/x86/proprietary/product/priv-app/GmsCore/GmsCore.apk and /dev/null differ diff --git a/x86/proprietary/product/priv-app/Phonesky/Phonesky.apk b/x86/proprietary/product/priv-app/Phonesky/Phonesky.apk deleted file mode 100644 index 29943e2..0000000 Binary files a/x86/proprietary/product/priv-app/Phonesky/Phonesky.apk and /dev/null differ diff --git a/x86/proprietary/product/priv-app/Velvet/Velvet.apk b/x86/proprietary/product/priv-app/Velvet/Velvet.apk deleted file mode 100644 index 4813525..0000000 Binary files a/x86/proprietary/product/priv-app/Velvet/Velvet.apk and /dev/null differ diff --git a/x86/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk b/x86/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk deleted file mode 100644 index f4aa86b..0000000 Binary files a/x86/proprietary/system_ext/priv-app/SetupWizard/SetupWizard.apk and /dev/null differ diff --git a/x86/x86-vendor.mk b/x86/x86-vendor.mk deleted file mode 100644 index 4abb867..0000000 --- a/x86/x86-vendor.mk +++ /dev/null @@ -1,21 +0,0 @@ -# Automatically generated file. DO NOT MODIFY -# -# This file is generated by device/gapps/x86/setup-makefiles.sh - -PRODUCT_SOONG_NAMESPACES += \ - vendor/gapps/x86 - - -PRODUCT_PACKAGES += \ - libjni_latinimegoogle \ - GmsCore \ - Phonesky - -ifeq ($(TARGET_IS_GROUPER),) - -PRODUCT_PACKAGES += \ - Velvet \ - SetupWizard -endif - -$(call inherit-product, vendor/gapps/common/common-vendor.mk)