am 9682e56a: Merge "Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit""

* commit '9682e56a794f2fc68cae00475b7f11927c57b3da':
  Revert "Rename dalvik.vm.usejit to debug.dalvik.vm.usejit"
This commit is contained in:
Mathieu Chartier 2015-03-19 16:51:34 +00:00 committed by Android Git Automerger
commit 68f6e30521
2 changed files with 6 additions and 1 deletions

View File

@ -339,6 +339,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop) $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
# Revert rename dalvik.vm.usejit to debug.dalvik.vm.usejit
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/root/default.prop)
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
# ************************************************ # ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************ # ************************************************

View File

@ -393,7 +393,7 @@ ifndef is_sdk_build
# Don't compile apps on eng builds to speed startup # Don't compile apps on eng builds to speed startup
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only
endif endif
ADDITIONAL_BUILD_PROPERTIES += debug.dalvik.vm.usejit=true ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
endif endif
## sdk ## ## sdk ##