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

Commit 90f285ba authored by hansson's avatar hansson Committed by android-build-merger
Browse files

Merge "CtsShim: build tweaks for 64-bit only builds." am: a869d143 am: a4428dc5 

am: 60108dce

Change-Id: Ifc575a70b4b2fda3155353c78239a35220cf4b7d
parents d93e8866 60108dce

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)