diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2016-05-23 23:47:53 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2016-05-23 23:47:53 +0000 |
| commit | 362c8254bd75473bd7b34b8fda7c25a5edfea996 (patch) | |
| tree | 7a89b9506d73d0575c55f43bb4e356775d353c62 | |
| parent | ffc2f8b6938a085d94038a5c7ba881361e97345a (diff) | |
| parent | e92b1fda4740c5e6a97b97ddf5544384f7b4f866 (diff) | |
| download | extras-362c8254bd75473bd7b34b8fda7c25a5edfea996.tar.gz | |
Merge "Use LOCAL_CTS_GTEST_LIST_EXECUTABLE"
| -rw-r--r-- | tests/kernel.config/Android.mk | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk index fc90f669..7a9354d7 100644 --- a/tests/kernel.config/Android.mk +++ b/tests/kernel.config/Android.mk @@ -38,22 +38,6 @@ LOCAL_CFLAGS := -DHAS_KCMP LOCAL_SRC_FILES := $(test_src_files) include $(BUILD_NATIVE_TEST) -include $(CLEAR_VARS) -LOCAL_MODULE := $(cts_executable) -LOCAL_MODULE_TAGS := optional -LOCAL_CFLAGS := $(test_c_flags) -LOCAL_CFLAGS := -DHAS_KCMP -LOCAL_SRC_FILES := $(cts_src_files) -LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest -LOCAL_MULTILIB := both -LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 -LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 -LOCAL_STATIC_LIBRARIES := libgtest libgtest_main - -LOCAL_COMPATIBILITY_SUITE := cts_v2 -LOCAL_CTS_TEST_PACKAGE := android.kernel.config -include $(BUILD_CTS_EXECUTABLE) - ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64)) include $(CLEAR_VARS) @@ -72,6 +56,23 @@ include $(BUILD_HOST_NATIVE_TEST) endif # ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64)) include $(CLEAR_VARS) +LOCAL_MODULE := $(cts_executable) +LOCAL_MODULE_TAGS := optional +LOCAL_CFLAGS := $(test_c_flags) +LOCAL_CFLAGS := -DHAS_KCMP +LOCAL_SRC_FILES := $(cts_src_files) +LOCAL_MODULE_PATH := $(TARGET_OUT_DATA)/nativetest +LOCAL_MULTILIB := both +LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)32 +LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64 +LOCAL_STATIC_LIBRARIES := libgtest libgtest_main + +LOCAL_COMPATIBILITY_SUITE := cts_v2 +LOCAL_CTS_TEST_PACKAGE := android.kernel.config +LOCAL_CTS_GTEST_LIST_EXECUTABLE := $(ALL_MODULES.$(cts_executable)_list$(HOST_2ND_ARCH_MODULE_SUFFIX).INSTALLED) +include $(BUILD_CTS_EXECUTABLE) + +include $(CLEAR_VARS) LOCAL_SRC_FILES := \ scrape_mmap_addr.cpp |