am d8a89a88: am c776f063: Merge "Build: Do not set interpreted mode for SDK build" into lmp-dev

* commit 'd8a89a8847897dd3c0a2b05dcc09c6f3ccc44c8f':
  Build: Do not set interpreted mode for SDK build
This commit is contained in:
Andreas Gampe 2014-10-04 15:45:06 +00:00 committed by Android Git Automerger
commit ec70fdaa35
1 changed files with 6 additions and 4 deletions

View File

@ -377,10 +377,12 @@ ifneq ($(filter ro.setupwizard.mode=ENABLED, $(call collapse-pairs, $(ADDITIONAL
$(call collapse-pairs, $(ADDITIONAL_BUILD_PROPERTIES))) \
ro.setupwizard.mode=OPTIONAL
endif
# 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
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
endif
endif
## sdk ##