From f7ad63ae65f75e5aa0d0a8234feddacdace95df0 Mon Sep 17 00:00:00 2001 From: Dan Bornstein Date: Tue, 31 May 2011 10:29:47 -0700 Subject: [PATCH] Clean up how dex preoptimization gets configured. Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5 --- core/main.mk | 14 ++++++++------ core/product_config.mk | 9 --------- 2 files changed, 8 insertions(+), 15 deletions(-) diff --git a/core/main.mk b/core/main.mk index b3bd87b5b..a8679e14e 100644 --- a/core/main.mk +++ b/core/main.mk @@ -235,13 +235,15 @@ ifneq (,$(user_variant)) enable_target_debugging := endif - # TODO: Remove this and the corresponding block in - # config/product_config.make once host-based Dalvik preoptimization is - # working. + # Turn on Dalvik preoptimization for user builds, but only if not + # explicitly disabled and the build is running on Linux (since host + # Dalvik isn't built for non-Linux hosts). ifneq (true,$(DISABLE_DEXPREOPT)) - ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true) - WITH_DEXPREOPT := true - endif + ifeq ($(user_variant),user) + ifeq ($(HOST_OS),linux) + WITH_DEXPREOPT := true + endif + endif endif # Disallow mock locations by default for user builds diff --git a/core/product_config.mk b/core/product_config.mk index 599dd045c..df5d30e11 100644 --- a/core/product_config.mk +++ b/core/product_config.mk @@ -124,15 +124,6 @@ ifdef product_goals default_goal_substitution := tests-build-target endif - # Hack to make the linux build servers use dexpreopt (emulator-based - # preoptimization). Most engineers don't use this type of target - # ("make PRODUCT-blah-user"), so this should only tend to happen when - # using buildbot. - # TODO: Remove this once host Dalvik preoptimization is working. - ifeq ($(TARGET_BUILD_VARIANT),user) - WITH_DEXPREOPT_buildbot := true - endif - # Replace the PRODUCT-* goal with the build goal that it refers to. # Note that this will ensure that it appears in the same relative # position, in case it matters. -- 2.11.0