Merge "build native tests for 32-bit and 64-bit" (c0275247) · Commits · e / os / android_build

core/native_test.mk

+2 −0

Original line number	Diff line number	Diff line
		@@ -5,4 +5,6 @@

		include $(BUILD_SYSTEM)/target_test_internal.mk

		LOCAL_MULTILIB := both

		include $(BUILD_EXECUTABLE)

+13 −2

Original line number	Diff line number	Diff line
		@@ -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)