commit 7a3ccd0082aae9dad53733549e5d414af1de00d6
author Victor Hsieh <victorhsieh@google.com> Wed Sep 08 11:59:29 2021 -0700
committer Victor Hsieh <victorhsieh@google.com> Thu Sep 16 14:58:27 2021 +0000
tree ce2f7b2d2d0d811704da0405568a72f189a975b7
parent c2aa7a31fb825f51a9d1973fb877ee043cb0ff4c

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

build/Android.common_path.mk

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.