From 2abc44c2fe30760aac0051a3a2f43ad0baeae05e Mon Sep 17 00:00:00 2001 From: Andreas Gampe Date: Fri, 3 Oct 2014 13:36:51 -0700 Subject: [PATCH] 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 | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/core/main.mk b/core/main.mk index fcddf8975..749929a5f 100644 --- a/core/main.mk +++ b/core/main.mk @@ -378,10 +378,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 ##