diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-05-28 22:31:44 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-05-28 22:31:44 +0000 |
| commit | ed97938caa7a1e7cde1d060ebbe6f6af1279188e (patch) | |
| tree | efe5824fce5dbe9f2f6c5ffd874d429fb6f6454f | |
| parent | 8898f2e261d1bb2b389971803a1f4a23639ade9e (diff) | |
| parent | 7df64f7c0d933e3a5f18e0d15402f62b819ef8f0 (diff) | |
| download | build-ed97938caa7a1e7cde1d060ebbe6f6af1279188e.zip build-ed97938caa7a1e7cde1d060ebbe6f6af1279188e.tar.gz build-ed97938caa7a1e7cde1d060ebbe6f6af1279188e.tar.bz2 | |
am 7df64f7c: Merge "Move to dalvik.vm.lib.2 to force default to libart"
* commit '7df64f7c0d933e3a5f18e0d15402f62b819ef8f0':
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 d1108b7..ba94faf 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 |