commit c56152c9202d842dd5a38afa6e0b32ee7f2a2790
author Jiakai Zhang <jiakaiz@google.com> Wed Dec 15 13:52:13 2021 +0000
committer Treehugger Robot <treehugger-gerrit@google.com> Wed Dec 15 15:18:01 2021 +0000
tree 9c945891723c41bececf01372215d459095e86ff
parent 1001c80a8e798a9511595cd4e921ad0cb49852a8

Revert the changes to ART_HOST_DEX_DEPENDENCIES.

The host variant of core libraries are still needed by some LUCI tests.

Bug: 210410981
Test: art/tools/run-libcore-tests.sh --mode=host --variant=X32 --debug
Change-Id: I4aac23d9f740afe70f9ed41f1742e44cfeb2b2fd

build/Android.common_path.mk

diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 345a869..962f691 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -82,8 +82,8 @@
 
 HOST_CORE_IMG_OUTS += $(HOST_BOOT_IMAGE_JARS) $(HOST_BOOT_IMAGE) $(2ND_HOST_BOOT_IMAGE)
 
-HOST_TEST_ADDITIONAL_JARS := core-icu4j conscrypt
-ART_HOST_DEX_DEPENDENCIES := $(foreach jar,$(CORE_IMG_JARS),$(CORE_IMG_JAR_DIR)/$(jar).jar) $(foreach jar,$(HOST_TEST_ADDITIONAL_JARS),$(HOST_OUT_JAVA_LIBRARIES)/$(jar)-hostdex.jar)
+HOST_TEST_CORE_JARS := $(addsuffix -hostdex,$(CORE_IMG_JARS) core-icu4j conscrypt)
+ART_HOST_DEX_DEPENDENCIES := $(foreach jar,$(HOST_TEST_CORE_JARS),$(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)
 ART_TARGET_DEX_DEPENDENCIES := com.android.art.testing com.android.conscrypt com.android.i18n
 
 ART_CORE_SHARED_LIBRARIES := libjavacore libopenjdk libopenjdkjvm libopenjdkjvmti