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
This commit is contained in:
Colin Cross 2014-03-24 18:39:18 -07:00
parent e6e48f67d8
commit 8c141e7e9f
2 changed files with 15 additions and 2 deletions

View File

@ -5,4 +5,6 @@
include $(BUILD_SYSTEM)/target_test_internal.mk
LOCAL_MULTILIB := both
include $(BUILD_EXECUTABLE)

View File

@ -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)