summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-08 21:57:32 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2014-05-08 21:57:32 +0000
commit676c8f0450a9dfb84c12257195ba05619aeed970 (patch)
treed892184cee59ebda0f70cdd707c1cce423a36038
parentaf93afcec91d31d1f5afb88b83413cdc7c019e70 (diff)
parent4ed19f0f4294544d0447025f0079a9d9e185a495 (diff)
downloadbuild-676c8f0450a9dfb84c12257195ba05619aeed970.zip
build-676c8f0450a9dfb84c12257195ba05619aeed970.tar.gz
build-676c8f0450a9dfb84c12257195ba05619aeed970.tar.bz2
am 4ed19f0f: am 1e63c2d1: Merge "Add dalvik.vm.dex2oat-flags for eng build"
* commit '4ed19f0f4294544d0447025f0079a9d9e185a495': Add dalvik.vm.dex2oat-flags for eng build
-rw-r--r--CleanSpec.mk3
-rw-r--r--core/main.mk4
2 files changed, 7 insertions, 0 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk
index 92e02a1..e83f2e7 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -226,6 +226,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS/*)
# Add ro.product.cpu.abilist{32,64} to build.prop.
$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+# Adding dalvik.vm.dex2oat-flags to eng builds
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+
# ************************************************
# NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST
# ************************************************
diff --git a/core/main.mk b/core/main.mk
index c02ee5b..d2d4ab5 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -393,6 +393,10 @@ 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-flags=--compiler-filter=verify-none
+# Don't compile apps on eng builds to speed startup
+ADDITIONAL_BUILD_PROPERTIES += dalvik.vm.dex2oat-flags=--compiler-filter=interpret-only
endif
## sdk ##