diff options
| author | Mathieu Chartier <mathieuc@google.com> | 2015-03-23 22:55:28 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-03-23 22:55:28 +0000 |
| commit | 0626a6421e85198a012c16db7a48a4327c445522 (patch) | |
| tree | 897a4078c9b586e7669d17f56df98c5bfe4298e3 | |
| parent | 99fbd8202806d79d75c18c65c89c2d59c89abe73 (diff) | |
| parent | 783a632f45fdddaa2073445728db61d2041a3435 (diff) | |
| download | build-0626a6421e85198a012c16db7a48a4327c445522.zip build-0626a6421e85198a012c16db7a48a4327c445522.tar.gz build-0626a6421e85198a012c16db7a48a4327c445522.tar.bz2 | |
am 783a632f: am 7f914204: am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
* commit '783a632f45fdddaa2073445728db61d2041a3435':
Change eng builds from interpret-only to verify-at-runtime
| -rw-r--r-- | CleanSpec.mk | 5 | ||||
| -rw-r--r-- | core/main.mk | 8 |
2 files changed, 9 insertions, 4 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 970d0f8..74e7c43 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -349,6 +349,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)/recovery/root/default.prop) +# Change from interpret-only to verify-at-runtime. +$(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 a360d6c..7350f99 100644 --- a/core/main.mk +++ b/core/main.mk @@ -388,10 +388,10 @@ ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL ro.setupwizard.mode=OPTIONAL endif ifndef is_sdk_build - # Don't even verify the image on eng builds to speed startup - 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-filter=interpret-only + # Don't verify or compile the image on eng builds to speed startup. + ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-at-runtime + # Don't verify or compile apps on eng builds to speed startup. + ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=verify-at-runtime endif ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true endif |