diff options
| author | 2018-10-17 12:28:18 -0700 | |
|---|---|---|
| committer | 2018-10-17 12:28:18 -0700 | |
| commit | 2f3c42adfa6c855b3f705db957b5df6463e1b09c (patch) | |
| tree | d0b69d2bc1e0a71e70214bbd2bb21673b958ae35 | |
| parent | e86229a866e60adf0372a41004ea0fb6a42c4906 (diff) | |
| parent | 24515ea7ee92a1cd7c94209388530c751b8209ee (diff) | |
Merge "ART: Make ahat tests depend on the right dalvikvm"
am: 24515ea7ee
Change-Id: Ic1fd982ccb6f33c918946a3d72b4cddcc711ca2f
| -rw-r--r-- | tools/ahat/Android.mk | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/tools/ahat/Android.mk b/tools/ahat/Android.mk index 32e5b5525f..dcd910597d 100644 --- a/tools/ahat/Android.mk +++ b/tools/ahat/Android.mk @@ -104,9 +104,17 @@ $(AHAT_TEST_DUMP_PROGUARD_MAP): PRIVATE_AHAT_SOURCE_PROGUARD_MAP := $(proguard_d $(AHAT_TEST_DUMP_PROGUARD_MAP): $(proguard_dictionary) cp $(PRIVATE_AHAT_SOURCE_PROGUARD_MAP) $@ +ifeq (true,$(HOST_PREFER_32_BIT)) + AHAT_TEST_DALVIKVM_DEP := $(HOST_OUT_EXECUTABLES)/dalvikvm32 + AHAT_TEST_DALVIKVM_ARG := --32 +else + AHAT_TEST_DALVIKVM_DEP := $(HOST_OUT_EXECUTABLES)/dalvikvm64 + AHAT_TEST_DALVIKVM_ARG := --64 +endif + # Run ahat-test-dump.jar to generate test-dump.hprof and test-dump-base.hprof AHAT_TEST_DUMP_DEPENDENCIES := \ - $(HOST_OUT_EXECUTABLES)/dalvikvm64 \ + $(AHAT_TEST_DALVIKVM_DEP) \ $(ART_HOST_SHARED_LIBRARY_DEBUG_DEPENDENCIES) \ $(HOST_OUT_EXECUTABLES)/art \ $(HOST_CORE_IMG_OUT_BASE)$(CORE_IMG_SUFFIX) @@ -114,20 +122,24 @@ AHAT_TEST_DUMP_DEPENDENCIES := \ $(AHAT_TEST_DUMP_HPROF): PRIVATE_AHAT_TEST_ART := $(HOST_OUT_EXECUTABLES)/art $(AHAT_TEST_DUMP_HPROF): PRIVATE_AHAT_TEST_DUMP_JAR := $(AHAT_TEST_DUMP_JAR) $(AHAT_TEST_DUMP_HPROF): PRIVATE_AHAT_TEST_ANDROID_DATA := $(AHAT_TEST_DUMP_ANDROID_DATA) +$(AHAT_TEST_DUMP_HPROF): PRIVATE_AHAT_TEST_DALVIKVM_ARG := $(AHAT_TEST_DALVIKVM_ARG) $(AHAT_TEST_DUMP_HPROF): $(AHAT_TEST_DUMP_JAR) $(AHAT_TEST_DUMP_DEPENDENCIES) 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 --64 -cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@ + $(PRIVATE_AHAT_TEST_ART) -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 $(AHAT_TEST_DUMP_BASE_HPROF): PRIVATE_AHAT_TEST_DUMP_JAR := $(AHAT_TEST_DUMP_JAR) $(AHAT_TEST_DUMP_BASE_HPROF): PRIVATE_AHAT_TEST_ANDROID_DATA := $(AHAT_TEST_DUMP_BASE_ANDROID_DATA) +$(AHAT_TEST_DUMP_BASE_HPROF): PRIVATE_AHAT_TEST_DALVIKVM_ARG := $(AHAT_TEST_DALVIKVM_ARG) $(AHAT_TEST_DUMP_BASE_HPROF): $(AHAT_TEST_DUMP_JAR) $(AHAT_TEST_DUMP_DEPENDENCIES) 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 --64 -cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@ --base + $(PRIVATE_AHAT_TEST_ART) -d $(PRIVATE_AHAT_TEST_DALVIKVM_ARG) \ + -cp $(PRIVATE_AHAT_TEST_DUMP_JAR) Main $@ --base # --- ahat-ri-test-dump.jar ------- include $(CLEAR_VARS) |