commit c02752473f958cb1b23ca2f7d3fd1973b665e3c4
author Ying Wang <wangying@android.com> Mon Jun 09 22:52:59 2014 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Mon Jun 09 22:53:00 2014 +0000
tree 23813a35e5b637398ccaeb3174258305fea590b8
parent 5ad17493cdb329087459ef7cddaed20cb1bba707
parent 8c141e7e9f39f679afed0e2b0de30dc1b6521740

Merge "build native tests for 32-bit and 64-bit"

core/native_test.mk

diff --git a/core/native_test.mk b/core/native_test.mk
index fc08f79..bc7f2e7 100644
--- a/core/native_test.mk
+++ b/core/native_test.mk
@@ -5,4 +5,6 @@
 
 include $(BUILD_SYSTEM)/target_test_internal.mk
 
+LOCAL_MULTILIB := both
+
 include $(BUILD_EXECUTABLE)

core/target_test_internal.mk

diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index 49ea518..87503ea 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -19,6 +19,17 @@
 endif
 endif
 
-ifndef LOCAL_MODULE_PATH
-LOCAL_MODULE_PATH := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
+ifdef LOCAL_MODULE_PATH
+$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH when building test $(LOCAL_MODULE))
 endif
+
+ifdef LOCAL_MODULE_PATH_32
+$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_32 when building test $(LOCAL_MODULE))
+endif
+
+ifdef LOCAL_MODULE_PATH_64
+$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCAL_MODULE))
+endif
+
+LOCAL_MODULE_PATH_32 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
+LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)64/$(LOCAL_MODULE)