am ed97938c: am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit 'ed97938caa7a1e7cde1d060ebbe6f6af1279188e':
Move to dalvik.vm.lib.2 to force default to libart
diff --git a/CleanSpec.mk b/CleanSpec.mk
index c50798e..c16aa64 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -241,6 +241,9 @@
$(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
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -269,7 +269,7 @@
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