From: Brian Carlstrom <bdc@google.com>
Date: Wed, 28 May 2014 21:31:46 +0000 (-0700)
Subject: Move to dalvik.vm.lib.2 to force default to libart
X-Git-Tag: android-x86-6.0-r1~1145^2~21
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=7e127ebe;p=android-x86%2Fbuild.git

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

Bug: 14298175
Change-Id: Ie4a716dddddc4d339fd4f47033f2c546a1ca118a
---

diff --git a/CleanSpec.mk b/CleanSpec.mk
index 46e652bc2..0af94e080 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -249,6 +249,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 # Adding dalvik.vm.dex2oat-flags to eng builds
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.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 7f86d81bf..f7dcb4171 100644
--- 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