diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-28 19:13:27 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-07-30 15:57:16 -0700 |
| commit | 4d30e5e2604a77df2acd41e36cbca54cd42cbf0a (patch) | |
| tree | fbb761038c3d40b668ee1d2d68438888d7b8e588 | |
| parent | 717bc3a3b7ea2d8835523d01ba020332fb76ac5a (diff) | |
| download | build-4d30e5e2604a77df2acd41e36cbca54cd42cbf0a.zip build-4d30e5e2604a77df2acd41e36cbca54cd42cbf0a.tar.gz build-4d30e5e2604a77df2acd41e36cbca54cd42cbf0a.tar.bz2 | |
Move from dalvik.vm.image-dex2oat-flags to dalvik.vm.dex2oat-filter [build]
This will allow us to conditionally change the compiler-filter based on other properties.
Bug: 15165413
Change-Id: Ie3f9292d35e9d4abf93271b7d22b72d185ee5ce2
| -rw-r--r-- | CleanSpec.mk | 6 | ||||
| -rw-r--r-- | core/main.mk | 4 |
2 files changed, 8 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index fef406c..b3239d7 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -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 # ************************************************ diff --git a/core/main.mk b/core/main.mk index be2b300..562c3ef 100644 --- a/core/main.mk +++ b/core/main.mk @@ -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 ## |