diff options
| author | Brian Carlstrom <bdc@google.com> | 2014-08-04 12:21:46 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2014-08-04 12:21:46 -0700 |
| commit | 479eca858c85fb0a6cfa073012dba1dee6906030 (patch) | |
| tree | a1d3b7b75318e033c6f89cd2be395f5f50e2f9f9 | |
| parent | 70c6e14492e137bcde20d2a20c0e98a830a81fcb (diff) | |
| parent | 9b80095e6c9f44bc9d6751807c9d7d5ca940c281 (diff) | |
| download | build-479eca858c85fb0a6cfa073012dba1dee6906030.zip build-479eca858c85fb0a6cfa073012dba1dee6906030.tar.gz build-479eca858c85fb0a6cfa073012dba1dee6906030.tar.bz2 | |
resolved conflicts for merge of 9b80095e to lmp-dev-plus-aosp
Change-Id: Id37b96441818c5542b8c340f968183162a47191a
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rw-r--r-- | core/main.mk | 4 |
2 files changed, 7 insertions, 2 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index ab0bd2f..9ff0fb6 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -287,6 +287,11 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system) # 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 05205f1..609a657 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 ## |