commit c399e9670345ae450d7d9d3b19d6c7fa3c7b8771
author Dan Willemsen <dwillemsen@google.com> Thu Sep 29 22:40:10 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Fri Sep 30 10:57:56 2016 -0700
tree d785d216317f63f592be916b930daa1866980629
parent 3e3353e88f41ec08d1142aee801ec3251c0a774d

Remove LOCAL_CTS_GTEST_LIST_EXECUTABLE

The one user has been removed, this is no longer necessary.

Test: None
Change-Id: I387bca94f5b8b719bd75154d996bf64a487a57be

tests/kernel.config/Android.mk

diff --git a/tests/kernel.config/Android.mk b/tests/kernel.config/Android.mk
index c05fcc8..756344b 100644
--- a/tests/kernel.config/Android.mk
+++ b/tests/kernel.config/Android.mk
@@ -28,8 +28,6 @@
     aslr_rec_test.cpp \
     mmc_max_speed_test.cpp \
 
-cts_executable := CtsKernelConfigTestCases
-
 include $(CLEAR_VARS)
 LOCAL_MODULE := kernel-config-unit-tests
 LOCAL_MODULE_TAGS := tests
@@ -38,24 +36,8 @@
 LOCAL_SRC_FILES := $(test_src_files)
 include $(BUILD_NATIVE_TEST)
 
-ifeq ($(HOST_OS)-$(HOST_ARCH),$(filter $(HOST_OS)-$(HOST_ARCH),linux-x86 linux-x86_64))
-
 include $(CLEAR_VARS)
-LOCAL_MODULE := $(cts_executable)_list
-LOCAL_MODULE_TAGS := optional
-LOCAL_CFLAGS := $(test_c_flags)
-LOCAL_SRC_FILES := $(cts_src_files)
-LOCAL_MULTILIB := both
-LOCAL_MODULE_STEM_32 := $(LOCAL_MODULE)
-LOCAL_MODULE_STEM_64 := $(LOCAL_MODULE)64
-LOCAL_CXX_STL := libc++
-LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/Android.mk
-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 := CtsKernelConfigTestCases
 LOCAL_MODULE_TAGS := optional
 LOCAL_CFLAGS := $(test_c_flags)
 LOCAL_CFLAGS := -DHAS_KCMP
@@ -68,7 +50,6 @@
 
 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)