summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Mathieu Chartier <mathieuc@google.com> 2015-07-15 00:20:15 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2015-07-15 00:20:16 +0000
commit70451aea314de4743d2d15a48d33201a897c190d (patch)
treeceb15d06d102def09e78c1a737617e404ef0b20f
parent8ae3588989ea99d8c60f885e3d830e6e0c87ff5f (diff)
parentd71795bdc7a68b0bd40ebf8fdf195cf967240f84 (diff)
Merge "Change phony targets to set dalvik.vm.usejit properly"
-rw-r--r--Android.mk10
1 files changed, 8 insertions, 2 deletions
diff --git a/Android.mk b/Android.mk
index c01464a041..49b61bb221 100644
--- a/Android.mk
+++ b/Android.mk
@@ -427,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
@@ -437,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
@@ -457,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
@@ -467,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
@@ -477,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
########################################################################