diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-28 22:28:35 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-05-28 22:28:35 +0000 |
| commit | 7df64f7c0d933e3a5f18e0d15402f62b819ef8f0 (patch) | |
| tree | 1ec91705088e4a819de03295c5f9a3a5b1ae8590 | |
| parent | f4999d3b8a0d09e790767176c543df1c2ad53c5a (diff) | |
| parent | 31f5db27c6a55d930cdb970ad705a1e43153cb98 (diff) | |
| download | build-7df64f7c0d933e3a5f18e0d15402f62b819ef8f0.zip build-7df64f7c0d933e3a5f18e0d15402f62b819ef8f0.tar.gz build-7df64f7c0d933e3a5f18e0d15402f62b819ef8f0.tar.bz2 | |
Merge "Move to dalvik.vm.lib.2 to force default to libart"
| -rw-r--r-- | CleanSpec.mk | 3 | ||||
| -rw-r--r-- | core/product_config.mk | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index c64f316..76653f4 100644 --- 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 --- 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 |