commit dbf975507b3d5882f279b6f870dc3e0c3770d008
author Brian Carlstrom <bdc@google.com> Thu Jan 30 13:14:00 2014 -0800
committer Brian Carlstrom <bdc@google.com> Thu Jan 30 16:05:28 2014 -0800
tree cd29215a49e7a626125fa01c6fbdeae50ffd5dbc
parent eb2cc42d83dad6c631a34f52e54ecac34a2b174f

build: Rename persist.sys.dalvik.vm.lib to allow new default

Bug: 12798969

(cherry picked from commit 49f1fab8a5b82f6224ff1be601037270ecdb734b)

Change-Id: I7f211fca2b9c99b607dd91590a3e4a82501e0c7f

core/product_config.mk

diff --git a/core/product_config.mk b/core/product_config.mk
index 6688281..1333ff8 100644
--- a/core/product_config.mk
+++ b/core/product_config.mk
@@ -267,7 +267,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