commit 2abc44c2fe30760aac0051a3a2f43ad0baeae05e
author Andreas Gampe <agampe@google.com> Fri Oct 03 13:36:51 2014 -0700
committer Andreas Gampe <agampe@google.com> Fri Oct 03 13:46:24 2014 -0700
tree fd72555012c217729909f55a63629d2dfea35ddb
parent 72f0cf56b362b8a4b6cfefb3f47240aa9e2d5ce6

Build: Do not set interpreted mode for SDK build

In case of emulator images created for an sdk build (sdk, win_sdk,
sdk_addon), do not set dex2oat to compile apps interpret-only.

Bug: 17796919

Change-Id: I6961aa20fd3b6ea164a1f55321387e84c8983550

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 ##