diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-07-28 19:13:27 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-06 17:50:39 -0700 |
| commit | cced082f5d8e6386815a5cfba125789e78c5e7ca (patch) | |
| tree | 8fcc0cece7e2ff2dd53ddfe9f496f1a801ab5d73 | |
| parent | 56ef86df84ba7d8b26b663f49ae40f8c86b4b95b (diff) | |
| download | build-cced082f5d8e6386815a5cfba125789e78c5e7ca.zip build-cced082f5d8e6386815a5cfba125789e78c5e7ca.tar.gz build-cced082f5d8e6386815a5cfba125789e78c5e7ca.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
(cherry picked from commit 4d30e5e2604a77df2acd41e36cbca54cd42cbf0a)
Change-Id: I84e8038c6536291e6775f39b33556b8169fdf292
| -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 4e90c90..3918fce 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -283,6 +283,12 @@ $(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)/system) + +# 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 cdf3200..f33574b 100644 --- a/core/main.mk +++ b/core/main.mk @@ -374,9 +374,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 ## |