From f8bd617460911957f0770948f6d9208bfcdd34b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stefan=20R=C3=BCcker?= Date: Thu, 30 Jan 2020 01:02:02 +0100 Subject: [PATCH] Prefer ARCH specific prebuilt APKs The prebuilt APKs in the ARCH folder (e.g. arm64) should be preferred over the prebuilt APKs in the all folder. --- core/prebuilt_apk.mk | 37 ++++++++++++++++++------------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/core/prebuilt_apk.mk b/core/prebuilt_apk.mk index 2018d94..dda9aaa 100644 --- a/core/prebuilt_apk.mk +++ b/core/prebuilt_apk.mk @@ -21,32 +21,31 @@ ifneq ($(GAPPS_LOCAL_OVERRIDES_PACKAGES),) endif endif -LOCAL_SRC_FILES := $(call find-apk-for-pkg,all,$(LOCAL_PACKAGE_NAME)) - +LOCAL_SRC_FILES := $(call find-apk-for-pkg,$(TARGET_ARCH),$(LOCAL_PACKAGE_NAME)) ifdef LOCAL_SRC_FILES - LOCAL_PREBUILT_JNI_LIBS := $(call find-libs-in-apk,$(TARGET_ARCH),$(LOCAL_SRC_FILES)) -else - LOCAL_SRC_FILES := $(call find-apk-for-pkg,$(TARGET_ARCH),$(LOCAL_PACKAGE_NAME)) - ifdef LOCAL_SRC_FILES - ifeq ($(filter 21,$(call get-allowed-api-levels)),) - # only kitkat - ifneq ($(call find-libs-in-apk,$(TARGET_ARCH),$(LOCAL_SRC_FILES)),) - LOCAL_SHARED_LIBRARIES := $(notdir $(basename $(shell zipinfo -1 "$(LOCAL_SRC_FILES)" "$(call get-lib-search-path, $(TARGET_ARCH))" -x lib/*/crazy/* 2>/dev/null))) - endif - else - LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH) := $(call find-libs-in-apk,$(TARGET_ARCH),$(LOCAL_SRC_FILES)) + ifeq ($(filter 21,$(call get-allowed-api-levels)),) + # only kitkat + ifneq ($(call find-libs-in-apk,$(TARGET_ARCH),$(LOCAL_SRC_FILES)),) + LOCAL_SHARED_LIBRARIES := $(notdir $(basename $(shell zipinfo -1 "$(LOCAL_SRC_FILES)" "$(call get-lib-search-path, $(TARGET_ARCH))" -x lib/*/crazy/* 2>/dev/null))) endif else - ifdef TARGET_2ND_ARCH - LOCAL_SRC_FILES := $(call find-apk-for-pkg,$(TARGET_2ND_ARCH),$(LOCAL_PACKAGE_NAME)) - ifdef LOCAL_SRC_FILES - LOCAL_MODULE_TARGET_ARCH := $(TARGET_2ND_ARCH) - LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH) := $(call find-libs-in-apk,$(TARGET_2ND_ARCH),$(LOCAL_SRC_FILES)) - endif + LOCAL_PREBUILT_JNI_LIBS_$(TARGET_ARCH) := $(call find-libs-in-apk,$(TARGET_ARCH),$(LOCAL_SRC_FILES)) + endif +else + ifdef TARGET_2ND_ARCH + LOCAL_SRC_FILES := $(call find-apk-for-pkg,$(TARGET_2ND_ARCH),$(LOCAL_PACKAGE_NAME)) + ifdef LOCAL_SRC_FILES + LOCAL_MODULE_TARGET_ARCH := $(TARGET_2ND_ARCH) + LOCAL_PREBUILT_JNI_LIBS_$(TARGET_2ND_ARCH) := $(call find-libs-in-apk,$(TARGET_2ND_ARCH),$(LOCAL_SRC_FILES)) endif endif endif +ifndef LOCAL_SRC_FILES + LOCAL_SRC_FILES := $(call find-apk-for-pkg,all,$(LOCAL_PACKAGE_NAME)) + LOCAL_PREBUILT_JNI_LIBS := $(call find-libs-in-apk,$(TARGET_ARCH),$(LOCAL_SRC_FILES)) +endif + ifndef LOCAL_SRC_FILES # the three calls to find-apk-for-pkg above all failed. # emit an error if the module is in the set GAPPS_PRODUCT_PACKAGES - GAPPS_EXCLUDED_PACKAGES