Move to dalvik.vm.lib.2 to force default to libart

Bug: 14298175

(cherry picked from commit 7e127ebe0bf8753fcbeeac6140916d512322e308)

Change-Id: I0a94e01f46fcc074d8c8fd1e5558fb764ab47361

diff --git a/CleanSpec.mk b/CleanSpec.mk
index c64f316..76653f4 100644 (file)
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -227,6 +227,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
 
+# Rename persist.sys.dalvik.vm.lib.1 to allow new default
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
 # ************************************************

diff --git a/core/product_config.mk b/core/product_config.mk
index cb488c0..290dec4 100644 (file)
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -269,7 +269,7 @@ $(call clear-var-list, $(_product_var_list))
 PRODUCT_RUNTIMES := $(product_runtimes)
 product_runtimes :=
 
-PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES += persist.sys.dalvik.vm.lib.1=$(DALVIK_VM_LIB)
+PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES += persist.sys.dalvik.vm.lib.2=$(DALVIK_VM_LIB)
 
 ifeq ($(words $(PRODUCT_RUNTIMES)),1)
   # If we only have one runtime, we can strip classes.dex by default during dex_preopt