summaryrefslogtreecommitdiffstats
path: root/core/native_test.mk
diff options
context:
space:
mode:
authorYing Wang <wangying@google.com>2014-06-10 17:52:20 -0700
committerYing Wang <wangying@google.com>2014-06-10 17:52:20 -0700
commitad10cc76b6741b4e2efdb7bb55a1c95e6a1b027f (patch)
treedf378cd0ed8a95c403542454602634c5814d16ed /core/native_test.mk
parentcec9dc14185dd1df6704a4af226ffbb2a1b9cd87 (diff)
downloadbuild-ad10cc76b6741b4e2efdb7bb55a1c95e6a1b027f.zip
build-ad10cc76b6741b4e2efdb7bb55a1c95e6a1b027f.tar.gz
build-ad10cc76b6741b4e2efdb7bb55a1c95e6a1b027f.tar.bz2
Allow to opt out both multilib in native test.
This fixes error no 64-bit libdvm for dalvik-vm-unit-tests. Change-Id: Ieb21b3b636facbff32c62bca8bba1df6d21377c6
Diffstat (limited to 'core/native_test.mk')
-rw-r--r--core/native_test.mk4
1 files changed, 4 insertions, 0 deletions
diff --git a/core/native_test.mk b/core/native_test.mk
index bc7f2e7..93b7e1a 100644
--- a/core/native_test.mk
+++ b/core/native_test.mk
@@ -5,6 +5,10 @@
include $(BUILD_SYSTEM)/target_test_internal.mk
+ifndef LOCAL_MULTILIB
+ifndef LOCAL_32_BIT_ONLY
LOCAL_MULTILIB := both
+endif
+endif
include $(BUILD_EXECUTABLE)