commit 6a8f8c52da06de506b75fa524a56a30794849261
author Victor Chang <vichang@google.com> Thu May 07 13:35:08 2020 +0100
committer vichang <vichang@google.com> Thu May 07 13:03:08 2020 +0000
tree a314fe4ef644c6872082d05f9d2ca783308440ce
parent d20e51dcd0fc4b2b229c5b6a5e9b500ae042bc61

Set build dependecy on hostdex explicity from ahat hprof dump

Apparently, the build order of "m checkbuild" is different on
different builds.

Bug: 155966029
Test: m checkbuild
Test: rm out/host/linux-x86/framework/core-icu4j-hostdex.jar && m out/target/common/obj/JAVA_LIBRARIES/ahat-test-dump_intermediates/test-dump.hprof
Test: rm out/host/linux-x86/framework/core-icu4j-hostdex.jar && m out/target/common/obj/JAVA_LIBRARIES/ahat-test-dump_intermediates/test-dump-base.hprof
Change-Id: I736d4a6c298a9a66032b018d6106c28a49cc2c07

tools/ahat/Android.mk

diff --git a/tools/ahat/Android.mk b/tools/ahat/Android.mk
index 160bb28..3dc2f10 100644
--- a/tools/ahat/Android.mk
+++ b/tools/ahat/Android.mk
@@ -58,6 +58,7 @@
   $(AHAT_TEST_DALVIKVM_DEP) \
   $(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) \
   $(ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES) \
+  $(ART_HOST_DEX_DEPENDENCIES) \
   $(HOST_OUT_EXECUTABLES)/art \
   $(HOST_CORE_IMG_OUT_BASE)$(CORE_IMG_SUFFIX)