commit 397a8be4bc26a696cf205ac9800865caee3ecf61
author Christopher Ferris <cferris@google.com> Sun Oct 05 19:19:56 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Sun Oct 05 19:19:57 2014 +0000
tree 7c70ef0ff1f997c8ef4fb7a81dbe6e747c8169c2
parent c776f06379929f1e1b9d1f4bb0749faf36e19670
parent 855d27f6297966ac0576a57cd9b0c931d4a30fb6

Merge "Call art-on only when debugging ART processes." into lmp-dev

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index fcddf89..749929a 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -378,10 +378,12 @@
           $(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 ##