Disable host build of odrefresh
So that we won't need to worry when a future dependency is lack of a
host variant.
This change removes odrefresh from the host apex and
"ART_CORE_DEBUGGABLE_EXECUTABLES_HOST".
Bug: 199302192
Test: art/build/apex/runtests.sh
Test: art/tools/golem/build-target.sh --machine-type=linux-armv8
Test: m art-runtime
Test: TH
Change-Id: I9ffe940eac14968f0daa79a290ab21eb7ee1f061
diff --git a/build/Android.gtest.mk b/build/Android.gtest.mk
index e08b5ac..0bc93c2 100644
--- a/build/Android.gtest.mk
+++ b/build/Android.gtest.mk
@@ -99,7 +99,7 @@
# The path for which all the source files are relative, not actually the current directory.
LOCAL_PATH := art
-ART_TEST_MODULES := \
+ART_TEST_MODULES_COMMON := \
art_cmdline_tests \
art_compiler_host_tests \
art_compiler_tests \
@@ -122,23 +122,25 @@
art_libdexfile_tests \
art_libprofile_tests \
art_oatdump_tests \
- art_odrefresh_tests \
art_profman_tests \
art_runtime_compiler_tests \
art_runtime_tests \
art_sigchain_tests \
-ART_TARGET_GTEST_NAMES := $(foreach tm,$(ART_TEST_MODULES),\
+ART_TEST_MODULES_TARGET := $(ART_TEST_MODULES_COMMON) art_odrefresh_tests
+ART_TEST_MODULES_HOST := $(ART_TEST_MODULES_COMMON)
+
+ART_TARGET_GTEST_NAMES := $(foreach tm,$(ART_TEST_MODULES_TARGET),\
$(foreach path,$(ART_TEST_LIST_device_$(TARGET_ARCH)_$(tm)),\
$(notdir $(path))\
)\
)
-ART_HOST_GTEST_FILES := $(foreach m,$(ART_TEST_MODULES),\
+ART_HOST_GTEST_FILES := $(foreach m,$(ART_TEST_MODULES_HOST),\
$(ART_TEST_LIST_host_$(ART_HOST_ARCH)_$(m)))
ifneq ($(HOST_PREFER_32_BIT),true)
-2ND_ART_HOST_GTEST_FILES += $(foreach m,$(ART_TEST_MODULES),\
+2ND_ART_HOST_GTEST_FILES += $(foreach m,$(ART_TEST_MODULES_HOST),\
$(ART_TEST_LIST_host_$(2ND_ART_HOST_ARCH)_$(m)))
endif