Move to dalvik.vm.lib.2 to force default to libart
Bug: 14298175
(cherry picked from commit b9c0c40e1f7eb38337919200f1fa328eaed92c1d)
Change-Id: I453d5391d757dcdac1f6fa3b1fb7bc85144177e1
diff --git a/Android.mk b/Android.mk
index a63c29b..b329a5a 100644
--- a/Android.mk
+++ b/Android.mk
@@ -443,21 +443,21 @@
use-art:
adb root && sleep 3
adb shell stop
- adb shell setprop persist.sys.dalvik.vm.lib.1 libart.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so
adb shell start
.PHONY: use-artd
use-artd:
adb root && sleep 3
adb shell stop
- adb shell setprop persist.sys.dalvik.vm.lib.1 libartd.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libartd.so
adb shell start
.PHONY: use-dalvik
use-dalvik:
adb root && sleep 3
adb shell stop
- adb shell setprop persist.sys.dalvik.vm.lib.1 libdvm.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libdvm.so
adb shell start
.PHONY: use-art-full
@@ -467,7 +467,7 @@
adb shell rm -rf $(ART_DALVIK_CACHE_DIR)/*
adb shell setprop dalvik.vm.dex2oat-flags ""
adb shell setprop dalvik.vm.image-dex2oat-flags ""
- adb shell setprop persist.sys.dalvik.vm.lib.1 libart.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so
adb shell start
.PHONY: use-artd-full
@@ -477,7 +477,7 @@
adb shell rm -rf $(ART_DALVIK_CACHE_DIR)/*
adb shell setprop dalvik.vm.dex2oat-flags ""
adb shell setprop dalvik.vm.image-dex2oat-flags ""
- adb shell setprop persist.sys.dalvik.vm.lib.1 libartd.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libartd.so
adb shell start
.PHONY: use-art-smart
@@ -487,7 +487,7 @@
adb shell rm -rf $(ART_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 persist.sys.dalvik.vm.lib.1 libart.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so
adb shell start
.PHONY: use-art-interpret-only
@@ -497,7 +497,7 @@
adb shell rm -rf $(ART_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 persist.sys.dalvik.vm.lib.1 libart.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so
adb shell start
.PHONY: use-art-verify-none
@@ -507,7 +507,7 @@
adb shell rm -rf $(ART_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 persist.sys.dalvik.vm.lib.1 libart.so
+ adb shell setprop persist.sys.dalvik.vm.lib.2 libart.so
adb shell start
########################################################################