aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYuexi Ma <yuexima@google.com>2016-12-21 21:23:55 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-12-21 21:23:55 +0000
commitc3219c6d0957181cb065d640e119b0bd6f34b06a (patch)
tree528937b7a15f275288c132563f8c53e89fd83f18
parent336202c0e50b972de7f756def20afcdcb2ecbb6e (diff)
parent13af5e1dee58f25367c205b4e7fee3e56457e2c7 (diff)
downloadltp-c3219c6d0957181cb065d640e119b0bd6f34b06a.tar.gz
fix build on cts_arm64 am: 626ccef033 am: 6a3adcb24c
am: 13af5e1dee Change-Id: Iaa82ca1111665c17b8573bedd202869b13e93756
-rw-r--r--android/Android.test.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/android/Android.test.mk b/android/Android.test.mk
index 63770b7f5..acda71cb2 100644
--- a/android/Android.test.mk
+++ b/android/Android.test.mk
@@ -22,9 +22,11 @@ LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TE
ifeq (1, $(target_support_64bit))
LOCAL_MODULE_STEM_64 := $(module_stem)
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/ltp/testcases/bin
+LOCAL_MULTILIB := both
+else
+LOCAL_MULTILIB := 32
endif
LOCAL_MODULE_TAGS := optional
-LOCAL_MULTILIB :=
LOCAL_CFLAGS := $(ltp_cflags) $(module_cflags)
LOCAL_CFLAGS_arm := $(ltp_cflags_arm)