From 696580785ef7f862e5e49867051c47712d185d0a Mon Sep 17 00:00:00 2001 From: Anton Hansson Date: Thu, 8 Feb 2018 13:32:40 +0000 Subject: [PATCH] CtsShim: build tweaks for 64-bit only builds. It would previously fail to find a matching abi for devices with TARGET_ARCH=arm64 and no TARGET_2ND_ARCH. The same apk was used in the 32-bit and 64-bit case anyway. This package has no code, so it's unclear why it has different apks for different archs. Test: lunch sailfish-eng; m -j Bug: 72810053 Change-Id: I800644ba848118556cd73d28bcf47e279d8eba76 --- packages/CtsShim/Android.mk | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/packages/CtsShim/Android.mk b/packages/CtsShim/Android.mk index 88b85e078f450..12972f14514bb 100644 --- a/packages/CtsShim/Android.mk +++ b/packages/CtsShim/Android.mk @@ -32,9 +32,10 @@ LOCAL_CERTIFICATE := PRESIGNED LOCAL_DEX_PREOPT := false LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64 -my_archs := arm x86 -my_src_arch := $(call get-prebuilt-src-arch, $(my_archs)) -LOCAL_SRC_FILES := apk/$(my_src_arch)/CtsShimPriv.apk +LOCAL_SRC_FILES_arm := apk/arm/CtsShimPriv.apk +LOCAL_SRC_FILES_arm64 := apk/arm/CtsShimPriv.apk +LOCAL_SRC_FILES_x86 := apk/x86/CtsShimPriv.apk +LOCAL_SRC_FILES_x86_64 := apk/x86/CtsShimPriv.apk include $(BUILD_PREBUILT) @@ -53,9 +54,10 @@ LOCAL_CERTIFICATE := PRESIGNED LOCAL_DEX_PREOPT := false LOCAL_MODULE_TARGET_ARCH := arm arm64 x86 x86_64 -my_archs := arm x86 -my_src_arch := $(call get-prebuilt-src-arch, $(my_archs)) -LOCAL_SRC_FILES := apk/$(my_src_arch)/CtsShim.apk +LOCAL_SRC_FILES_arm := apk/arm/CtsShim.apk +LOCAL_SRC_FILES_arm64 := apk/arm/CtsShim.apk +LOCAL_SRC_FILES_x86 := apk/x86/CtsShim.apk +LOCAL_SRC_FILES_x86_64 := apk/x86/CtsShim.apk include $(BUILD_PREBUILT)