Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 239f2b0f authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Finish refactoring tests to NATIVE_TESTS"

parents 59e060e1 e1c6deab

core/host_native_test.mk

+0 −4
Original line number Diff line number Diff line
@@ -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)

core/host_shared_test_lib.mk

+0 −9
Original line number Diff line number Diff line 
##################################################

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

core/host_test_internal.mk

+4 −0
Original line number Diff line number Diff line
@@ -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

core/native_test.mk

+6 −9
Original line number Diff line number Diff line
@@ -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)

core/shared_test_lib.mk

+0 −9
Original line number Diff line number Diff line 
#############################################

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