summaryrefslogtreecommitdiffstats
path: root/core/target_test_internal.mk
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2014-03-24 18:39:18 -0700
committerColin Cross <ccross@android.com>2014-03-26 13:13:23 -0700
commit8c141e7e9f39f679afed0e2b0de30dc1b6521740 (patch)
treea27fa715d3a6c672b164c0d01f74d66006954d58 /core/target_test_internal.mk
parente6e48f67d8fac2b5a29dbfeb1ad40610a451b792 (diff)
downloadbuild-8c141e7e9f39f679afed0e2b0de30dc1b6521740.zip
build-8c141e7e9f39f679afed0e2b0de30dc1b6521740.tar.gz
build-8c141e7e9f39f679afed0e2b0de30dc1b6521740.tar.bz2
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
Diffstat (limited to 'core/target_test_internal.mk')
-rw-r--r--core/target_test_internal.mk15
1 files changed, 13 insertions, 2 deletions
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_C_INCLUDES += bionic \
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)