commit a15fc8fd1aad30631b7605f3120bdee3b8cf2ba4
author Brian Carlstrom <bdc@google.com> Fri Jan 31 12:34:17 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Jan 31 12:34:17 2014 +0000
tree e12b873d0e033120a7d4cb1b2cf0c583b2b971ec
parent 0ddbc6c215c34f708fcc898be25ddffc18282881
parent 601d39b688bcbb1789e145d1b72753206c24d374

am 601d39b6: Merge "build: Rename persist.sys.dalvik.vm.lib to allow new default"

* commit '601d39b688bcbb1789e145d1b72753206c24d374':
  build: Rename persist.sys.dalvik.vm.lib to allow new default

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 11336d8..61bdfb4 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=$(DALVIK_VM_LIB)
+PRODUCTS.$(INTERNAL_PRODUCT).PRODUCT_PROPERTY_OVERRIDES += persist.sys.dalvik.vm.lib.1=$(DALVIK_VM_LIB)
 
 ifeq ($(words $(PRODUCT_RUNTIMES)),1)
   # If we only have one runtime, we can strip classes.dex by default during dex_preopt