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.common_path.mk b/build/Android.common_path.mk
index c6f4819..3d04763 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -99,14 +99,16 @@
ART_TARGET_SHARED_LIBRARY_DEBUG_DEPENDENCIES += $(foreach lib,$(ART_CORE_SHARED_DEBUG_LIBRARIES), $(2ND_TARGET_OUT_SHARED_LIBRARIES)/$(lib).so)
endif
-ART_CORE_DEBUGGABLE_EXECUTABLES := \
+ART_CORE_DEBUGGABLE_EXECUTABLES_COMMON := \
dex2oat \
dexoptanalyzer \
imgdiag \
oatdump \
- odrefresh \
profman \
+ART_CORE_DEBUGGABLE_EXECUTABLES_TARGET := $(ART_CORE_DEBUGGABLE_EXECUTABLES_COMMON) odrefresh
+ART_CORE_DEBUGGABLE_EXECUTABLES_HOST := $(ART_CORE_DEBUGGABLE_EXECUTABLES_COMMON)
+
ART_CORE_EXECUTABLES := \
dalvikvm \
dexlist \
@@ -115,18 +117,18 @@
# for each module
ART_TARGET_EXECUTABLES :=
ifneq ($(ART_BUILD_TARGET_NDEBUG),false)
-ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES) $(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)-target)
+ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES) $(ART_CORE_DEBUGGABLE_EXECUTABLES_TARGET),$(name)-target)
endif
ifneq ($(ART_BUILD_TARGET_DEBUG),false)
-ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)d-target)
+ART_TARGET_EXECUTABLES += $(foreach name,$(ART_CORE_DEBUGGABLE_EXECUTABLES_TARGET),$(name)d-target)
endif
ART_HOST_EXECUTABLES :=
ifneq ($(ART_BUILD_HOST_NDEBUG),false)
-ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES) $(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)-host)
+ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_EXECUTABLES) $(ART_CORE_DEBUGGABLE_EXECUTABLES_HOST),$(name)-host)
endif
ifneq ($(ART_BUILD_HOST_DEBUG),false)
-ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_DEBUGGABLE_EXECUTABLES),$(name)d-host)
+ART_HOST_EXECUTABLES += $(foreach name,$(ART_CORE_DEBUGGABLE_EXECUTABLES_HOST),$(name)d-host)
endif
# Release ART APEX, included by default in "user" builds.
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
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index cecdbe7..7efdcb8 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -33,9 +33,13 @@
// (likely 64-bit) and on host).
art_runtime_base_binaries_first_on_device_first_on_host = [
"dexoptanalyzer",
- "odrefresh",
"profman",
]
+// - Base requirements (binaries for which the "first" version is preferred on device
+// (likely 64-bit).
+art_runtime_base_binaries_first_on_device = [
+ "odrefresh",
+]
// - Base requirements (libraries).
//
@@ -257,6 +261,7 @@
},
first: {
binaries: art_runtime_base_binaries_first_on_device_first_on_host +
+ art_runtime_base_binaries_first_on_device +
art_tools_common_binaries +
art_tools_device_only_binaries,
},
diff --git a/build/apex/art_apex_test.py b/build/apex/art_apex_test.py
index 68152b4..0f87901 100755
--- a/build/apex/art_apex_test.py
+++ b/build/apex/art_apex_test.py
@@ -580,7 +580,6 @@
self._checker.check_executable('hprof-conv')
self._checker.check_symlinked_first_executable('dex2oatd')
self._checker.check_symlinked_first_executable('dex2oat')
- self._checker.check_executable("odrefresh")
# Check exported native libraries for Managed Core Library.
self._checker.check_native_library('libicu')
diff --git a/odrefresh/Android.bp b/odrefresh/Android.bp
index acfd97a..9016719 100644
--- a/odrefresh/Android.bp
+++ b/odrefresh/Android.bp
@@ -55,7 +55,6 @@
cc_defaults {
name: "odrefresh_binary_defaults",
- host_supported: true,
defaults: [
"art_defaults",
"odrefresh-defaults",
@@ -187,6 +186,7 @@
"art_gtest_defaults",
"art_odrefresh_tests_defaults",
],
+ host_supported: false,
shared_libs: [
"libdexfiled",
],