am 55fbc49f: Merge "Change eng builds from interpret-only to verify-at-runtime"
* commit '55fbc49fe1993d87a6a978132c827f316f2be5a7': Change eng builds from interpret-only to verify-at-runtime
This commit is contained in:
commit
7f91420487
|
@ -344,6 +344,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)/root/default.prop)
|
||||||
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/recovery/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
|
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
|
||||||
# ************************************************
|
# ************************************************
|
||||||
|
|
|
@ -388,10 +388,10 @@ ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL
|
||||||
ro.setupwizard.mode=OPTIONAL
|
ro.setupwizard.mode=OPTIONAL
|
||||||
endif
|
endif
|
||||||
ifndef is_sdk_build
|
ifndef is_sdk_build
|
||||||
# Don't even verify the image on eng builds to speed startup
|
# Don't verify or compile the image on eng builds to speed startup.
|
||||||
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-none
|
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.image-dex2oat-filter=verify-at-runtime
|
||||||
# Don't compile apps on eng builds to speed startup
|
# Don't verify or compile apps on eng builds to speed startup.
|
||||||
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=interpret-only
|
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-filter=verify-at-runtime
|
||||||
endif
|
endif
|
||||||
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
|
ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.usejit=true
|
||||||
endif
|
endif
|
||||||
|
|
Loading…
Reference in New Issue