tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

am c0275247: Merge "build native tests for 32-bit and 64-bit"

Browse source 
* commit 'c02752473f958cb1b23ca2f7d3fd1973b665e3c4':
  build native tests for 32-bit and 64-bit
This commit is contained in:
Ying Wang 2014-06-09 22:57:48 +00:00 committed by Android Git Automerger
commit 322362cf01
2 changed files with 15 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/native_test.mk
View file

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

15
core/target_test_internal.mk
View file

@ -19,6 +19,17 @@ LOCAL_STATIC_LIBRARIES += libstdc++
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)