am 430ec575: Merge "Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]"

* commit '430ec575cd40672aab8394c31c7e45294ee302e5':
  Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This commit is contained in:
Brian Carlstrom 2014-08-04 18:33:00 +00:00 committed by Android Git Automerger
commit 9b80095e6c
2 changed files with 8 additions and 2 deletions

View file

@ -247,6 +247,12 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/root/default.prop)
# Switch host builds to Clang by default
$(call add-clean-step, rm -rf $(OUT_DIR)/host)
# Adding dalvik.vm.dex2oat-filter
$(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
# ************************************************

View file

@ -378,9 +378,9 @@ ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL
ro.setupwizard.mode=OPTIONAL
endif
# Don't even verify the image on eng builds to speed startup
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-flags=--compiler-filter=verify-none
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-none
# Don't compile apps on eng builds to speed startup
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-flags=--compiler-filter=interpret-only
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only
endif
## sdk ##