Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 69658078 authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent c86b195c

packages/CtsShim/Android.mk

+8 −6
Original line number Diff line number Diff line
@@ -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)