Run ahat-test-dump with --no-compile
Avoid dependency on dex2oat.
Bug: 125318570
Test: run ahat-test-dump after oat version bump.
Change-Id: I07d98fe269e70dd704aabb9c2b8b17fc8f82c2c9
diff --git a/tools/ahat/Android.mk b/tools/ahat/Android.mk
index e27878f..7333ef3 100644
--- a/tools/ahat/Android.mk
+++ b/tools/ahat/Android.mk
@@ -113,6 +113,7 @@
endif
# Run ahat-test-dump.jar to generate test-dump.hprof and test-dump-base.hprof
+# The scripts below are run with --no-compile to avoid dependency on dex2oat.
AHAT_TEST_DUMP_DEPENDENCIES := \
$(AHAT_TEST_DALVIKVM_DEP) \
$(ART_HOST_SHARED_LIBRARY_DEPENDENCIES) \
@@ -128,7 +129,7 @@
rm -rf $(PRIVATE_AHAT_TEST_ANDROID_DATA)
mkdir -p $(PRIVATE_AHAT_TEST_ANDROID_DATA)
ANDROID_DATA=$(PRIVATE_AHAT_TEST_ANDROID_DATA) \
- $(PRIVATE_AHAT_TEST_ART) -d $(PRIVATE_AHAT_TEST_DALVIKVM_ARG) \
+ $(PRIVATE_AHAT_TEST_ART) --no-compile -d $(PRIVATE_AHAT_TEST_DALVIKVM_ARG) \
-cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@
$(AHAT_TEST_DUMP_BASE_HPROF): PRIVATE_AHAT_TEST_ART := $(HOST_OUT_EXECUTABLES)/art
@@ -139,7 +140,7 @@
rm -rf $(PRIVATE_AHAT_TEST_ANDROID_DATA)
mkdir -p $(PRIVATE_AHAT_TEST_ANDROID_DATA)
ANDROID_DATA=$(PRIVATE_AHAT_TEST_ANDROID_DATA) \
- $(PRIVATE_AHAT_TEST_ART) -d $(PRIVATE_AHAT_TEST_DALVIKVM_ARG) \
+ $(PRIVATE_AHAT_TEST_ART) --no-compile -d $(PRIVATE_AHAT_TEST_DALVIKVM_ARG) \
-cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@ --base
# --- ahat-ri-test-dump.jar -------