summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrian Carlstrom <bdc@google.com>2014-05-08 21:49:31 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2014-05-08 21:49:31 +0000
commit1e63c2d15cba608a154bbd563f96dde334691147 (patch)
tree9cbbb34ddbcd57b7813684027c367eb29d114459
parent3b15cdb854dfe79507cace8ce54828861bbe7a8c (diff)
parentfceb115bd6601a64c0510cba5ff2041d060cf610 (diff)
downloadbuild-1e63c2d15cba608a154bbd563f96dde334691147.zip
build-1e63c2d15cba608a154bbd563f96dde334691147.tar.gz
build-1e63c2d15cba608a154bbd563f96dde334691147.tar.bz2
Merge "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 ee85995..17fd5d6 100644
--- a/CleanSpec.mk
+++ b/CleanSpec.mk
@@ -217,6 +217,9 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
# 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 5175bef..a6c946d 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 ##