StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '322362cf01e6d1ed6c73dd27f5a4e162610f55c4':
  build native tests for 32-bit and 64-bit
This commit is contained in:
Ying Wang
2014-06-09 23:00:02 +00:00
committed by Android Git Automerger
parent fe9ad0975a 322362cf01
commit b06c655e58
2 changed files with 15 additions and 2 deletions
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)