diff options
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 20 |
1 files changed, 17 insertions, 3 deletions
diff --git a/Android.mk b/Android.mk index 54a33b2305..49b61bb221 100644 --- a/Android.mk +++ b/Android.mk @@ -78,6 +78,8 @@ include $(art_path)/build/Android.cpplint.mk include $(art_path)/runtime/Android.mk include $(art_path)/compiler/Android.mk +include $(art_path)/dexdump/Android.mk +include $(art_path)/dexlist/Android.mk include $(art_path)/dex2oat/Android.mk include $(art_path)/disassembler/Android.mk include $(art_path)/oatdump/Android.mk @@ -166,7 +168,8 @@ test-art-host-vixl: $(VIXL_TEST_DEPENDENCY) # "mm test-art-host" to build and run all host tests. .PHONY: test-art-host -test-art-host: test-art-host-gtest test-art-host-run-test test-art-host-vixl +test-art-host: test-art-host-gtest test-art-host-run-test \ + test-art-host-vixl test-art-host-dexdump $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) # All host tests that run solely with the default compiler. @@ -235,6 +238,11 @@ test-art-host-jit$(2ND_ART_PHONY_TEST_HOST_SUFFIX): test-art-host-run-test-jit$( $(hide) $(call ART_TEST_PREREQ_FINISHED,$@) endif +# Dexdump/list regression test. +.PHONY: test-art-host-dexdump +test-art-host-dexdump: $(addprefix $(HOST_OUT_EXECUTABLES)/, dexdump2 dexlist2) + ANDROID_HOST_OUT=$(realpath $(HOST_OUT)) art/test/dexdump/run-all-tests + # Valgrind. Currently only 32b gtests. .PHONY: valgrind-test-art-host valgrind-test-art-host: valgrind-test-art-host-gtest32 @@ -419,6 +427,7 @@ use-art-full: adb shell setprop dalvik.vm.dex2oat-filter \"\" adb shell setprop dalvik.vm.image-dex2oat-filter \"\" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so + adb shell setprop dalvik.vm.usejit false adb shell start .PHONY: use-artd-full @@ -429,16 +438,18 @@ use-artd-full: adb shell setprop dalvik.vm.dex2oat-filter \"\" adb shell setprop dalvik.vm.image-dex2oat-filter \"\" adb shell setprop persist.sys.dalvik.vm.lib.2 libartd.so + adb shell setprop dalvik.vm.usejit false adb shell start -.PHONY: use-art-verify-at-runtime -use-art-verify-at-runtime: +.PHONY: use-art-jit +use-art-jit: adb root adb wait-for-device shell stop adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/* adb shell setprop dalvik.vm.dex2oat-filter "verify-at-runtime" adb shell setprop dalvik.vm.image-dex2oat-filter "verify-at-runtime" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so + adb shell setprop dalvik.vm.usejit true adb shell start .PHONY: use-art-interpret-only @@ -449,6 +460,7 @@ use-art-interpret-only: adb shell setprop dalvik.vm.dex2oat-filter "interpret-only" adb shell setprop dalvik.vm.image-dex2oat-filter "interpret-only" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so + adb shell setprop dalvik.vm.usejit false adb shell start .PHONY: use-artd-interpret-only @@ -459,6 +471,7 @@ use-artd-interpret-only: adb shell setprop dalvik.vm.dex2oat-filter "interpret-only" adb shell setprop dalvik.vm.image-dex2oat-filter "interpret-only" adb shell setprop persist.sys.dalvik.vm.lib.2 libartd.so + adb shell setprop dalvik.vm.usejit false adb shell start .PHONY: use-art-verify-none @@ -469,6 +482,7 @@ use-art-verify-none: adb shell setprop dalvik.vm.dex2oat-filter "verify-none" adb shell setprop dalvik.vm.image-dex2oat-filter "verify-none" adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so + adb shell setprop dalvik.vm.usejit false adb shell start ######################################################################## |