diff options
author | Brian Carlstrom <bdc@google.com> | 2014-05-28 23:13:28 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 23:13:28 +0000 |
commit | 9843e863953a2e1b7f38f0beab294d2c9d12a868 (patch) | |
tree | fb6127b939efd8dce2bb03e86d37d2cda2d41281 | |
parent | dcf90646b0122b09755014832a67b7c44bc2e1ac (diff) | |
parent | ed97938caa7a1e7cde1d060ebbe6f6af1279188e (diff) | |
download | build-9843e863953a2e1b7f38f0beab294d2c9d12a868.zip build-9843e863953a2e1b7f38f0beab294d2c9d12a868.tar.gz build-9843e863953a2e1b7f38f0beab294d2c9d12a868.tar.bz2 |
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
-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 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)/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 |