Finish refactoring tests to NATIVE_TESTS
Now that the source trees all use NATIVE_TESTS for intermediate files
and generated sources, make it a requirement.
Change-Id: Id5718fabe63f6e8dde7981a6f0f5bd89e0ec7ee5
diff --git a/core/native_test.mk b/core/native_test.mk
index d4b2a5b..bb93eb0 100644
--- a/core/native_test.mk
+++ b/core/native_test.mk
@@ -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 @@
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)