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

Merge \"Finish refactoring tests to NATIVE_TESTS\"

Browse source 
am: 239f2b0f9f

Change-Id: If34f994893a9ad00cadb3a6124ee21ccf36b142c
This commit is contained in:
Dan Willemsen 2016-06-22 20:41:57 +00:00 committed by android-build-merger
commit fed8d9e9f7
6 changed files with 10 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/host_native_test.mk
View file

@ -19,8 +19,4 @@ LOCAL_MULTILIB := both
endif
endif
ifndef LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_RELATIVE_PATH := $(LOCAL_MODULE)
endif
include $(BUILD_HOST_EXECUTABLE)

9
core/host_shared_test_lib.mk
View file

@ -1,10 +1 @@
##################################################
## A thin wrapper around BUILD_HOST_SHARED_LIBRARY
## Common flags for host native tests are added.
##################################################
$(error BUILD_HOST_SHARED_TEST_LIBRARY is obsolete)
include $(BUILD_SYSTEM)/host_test_internal.mk
include $(BUILD_HOST_SHARED_LIBRARY)

4
core/host_test_internal.mk
View file

@ -23,3 +23,7 @@ endif
ifdef LOCAL_MODULE_PATH_64
$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCAL_MODULE))
endif
ifndef LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_RELATIVE_PATH := $(LOCAL_MODULE)
endif

15
core/native_test.mk
View file

@ -3,10 +3,13 @@
## Common flags for native tests are added.
###########################################
# TODO: enforce NATIVE_TESTS once current users are gone
ifndef LOCAL_MODULE_CLASS
LOCAL_MODULE_CLASS := NATIVE_TESTS
ifdef LOCAL_MODULE_CLASS
ifneq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
$(error $(LOCAL_PATH): LOCAL_MODULE_CLASS must be NATIVE_TESTS with BUILD_HOST_NATIVE_TEST)
endif
endif
LOCAL_MODULE_CLASS := NATIVE_TESTS
include $(BUILD_SYSTEM)/target_test_internal.mk
@ -16,10 +19,4 @@ LOCAL_MULTILIB := both
endif
endif
ifneq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
$(warning $(LOCAL_PATH): $(LOCAL_MODULE): LOCAL_MODULE_CLASS should be NATIVE_TESTS with BUILD_NATIVE_TEST)
LOCAL_MODULE_PATH_64 := $(TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
LOCAL_MODULE_PATH_32 := $($(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_DATA_NATIVE_TESTS)/$(LOCAL_MODULE)
endif
include $(BUILD_EXECUTABLE)

9
core/shared_test_lib.mk
View file

@ -1,10 +1 @@
#############################################
## A thin wrapper around BUILD_SHARED_LIBRARY
## Common flags for native tests are added.
#############################################
$(error BUILD_SHARED_TEST_LIBRARY is obsolete)
include $(BUILD_SYSTEM)/target_test_internal.mk
include $(BUILD_SHARED_LIBRARY)

2
core/target_test_internal.mk
View file

@ -33,8 +33,6 @@ ifdef LOCAL_MODULE_PATH_64
$(error $(LOCAL_PATH): Do not set LOCAL_MODULE_PATH_64 when building test $(LOCAL_MODULE))
endif
ifeq ($(LOCAL_MODULE_CLASS),NATIVE_TESTS)
ifndef LOCAL_MODULE_RELATIVE_PATH
LOCAL_MODULE_RELATIVE_PATH := $(LOCAL_MODULE)
endif
endif