summaryrefslogtreecommitdiffstats
path: root/Android.mk
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-07-28 19:13:27 -0700
committerBrian Carlstrom <bdc@google.com>2014-07-30 15:57:14 -0700
commit2e879694544744436a595eb30cd0b8ad4580c9db (patch)
tree99095821233d96e0670b1be2d9057df143636c62 /Android.mk
parent01a0ebb6b96c32879dcad99d515fc0cd8de2a266 (diff)
downloadart-2e879694544744436a595eb30cd0b8ad4580c9db.zip
art-2e879694544744436a595eb30cd0b8ad4580c9db.tar.gz
art-2e879694544744436a595eb30cd0b8ad4580c9db.tar.bz2
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [art]
This will allow us to conditionally change the compiler-filter based on other properties. Bug: 15165413 Change-Id: I6877a6eab221ab142909b595fd28191b5d3a095b
Diffstat (limited to 'Android.mk')
-rw-r--r--Android.mk24
1 files changed, 12 insertions, 12 deletions
diff --git a/Android.mk b/Android.mk
index c5e90f2..e536a71 100644
--- a/Android.mk
+++ b/Android.mk
@@ -389,8 +389,8 @@ use-art-full:
adb root && sleep 3
adb shell stop
adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*
- adb shell setprop dalvik.vm.dex2oat-flags ""
- adb shell setprop dalvik.vm.image-dex2oat-flags ""
+ 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 start
@@ -399,8 +399,8 @@ use-artd-full:
adb root && sleep 3
adb shell stop
adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*
- adb shell setprop dalvik.vm.dex2oat-flags ""
- adb shell setprop dalvik.vm.image-dex2oat-flags ""
+ 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 start
@@ -409,8 +409,8 @@ use-art-smart:
adb root && sleep 3
adb shell stop
adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*
- adb shell setprop dalvik.vm.dex2oat-flags "--compiler-filter=interpret-only"
- adb shell setprop dalvik.vm.image-dex2oat-flags ""
+ adb shell setprop dalvik.vm.dex2oat-filter "interpret-only"
+ adb shell setprop dalvik.vm.image-dex2oat-filter ""
adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so
adb shell start
@@ -419,8 +419,8 @@ use-art-interpret-only:
adb root && sleep 3
adb shell stop
adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*
- adb shell setprop dalvik.vm.dex2oat-flags "--compiler-filter=interpret-only"
- adb shell setprop dalvik.vm.image-dex2oat-flags "--compiler-filter=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 start
@@ -429,8 +429,8 @@ use-artd-interpret-only:
adb root && sleep 3
adb shell stop
adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*
- adb shell setprop dalvik.vm.dex2oat-flags "--compiler-filter=interpret-only"
- adb shell setprop dalvik.vm.image-dex2oat-flags "--compiler-filter=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 start
@@ -439,8 +439,8 @@ use-art-verify-none:
adb root && sleep 3
adb shell stop
adb shell rm -rf $(ART_TARGET_DALVIK_CACHE_DIR)/*
- adb shell setprop dalvik.vm.dex2oat-flags "--compiler-filter=verify-none"
- adb shell setprop dalvik.vm.image-dex2oat-flags "--compiler-filter=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 start