build native tests for 32-bit and 64-bit
32-bit tests will build into /data/nativetest
64-bit tests will build into /data/nativetest64
Change-Id: I31492c7d1273ba18bb2577fae150008a214c3bf4
diff --git a/core/target_test_internal.mk b/core/target_test_internal.mk
index e531356..04dc489 100644
--- a/core/target_test_internal.mk
+++ b/core/target_test_internal.mk
@@ -14,6 +14,17 @@
LOCAL_SHARED_LIBRARIES += libstlport
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)