Fix ahat dependencies.
Add $(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) in addition to
$(ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES) as the latter
does not depend on the former. This brings the necessary
dependency on libjavacore.
Currently, the libjavacore is built thanks to the conscrypt,
included in core image, depending on it. However, we want to
remove the conscrypt from the core image, so we need to make
the dependency explicit.
Test: atest ahat-tests # from clean tree
Test: Repeat the test above with additional cherry-pick
https://android-review.googlesource.com/837432 .
Bug: 119868597
Change-Id: I0ff13db3787443874bae380514b3c058387395cf
diff --git a/tools/ahat/Android.mk b/tools/ahat/Android.mk
index dcd9105..e27878f 100644
--- a/tools/ahat/Android.mk
+++ b/tools/ahat/Android.mk
@@ -115,6 +115,7 @@
# Run ahat-test-dump.jar to generate test-dump.hprof and test-dump-base.hprof
AHAT_TEST_DUMP_DEPENDENCIES := \
$(AHAT_TEST_DALVIKVM_DEP) \
+ $(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) \
$(ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES) \
$(HOST_OUT_EXECUTABLES)/art \
$(HOST_CORE_IMG_OUT_BASE)$(CORE_IMG_SUFFIX)