commit f7ad63ae65f75e5aa0d0a8234feddacdace95df0
author Dan Bornstein <danfuzz@android.com> Tue May 31 10:29:47 2011 -0700
committer Dan Bornstein <danfuzz@android.com> Tue May 31 10:36:55 2011 -0700
tree 91be1a83fa9d802da9aca2a759651660fff6c001
parent 915db3c40bb725fa2016ad2d029c140d0d96ff2b

Clean up how dex preoptimization gets configured.

Change-Id: I505ac438f1b963060b4be36d94bb5fbee6112dc5

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index b3bd87b..a8679e1 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -235,13 +235,15 @@
     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