commit 0235237805991b48831dc8add072a50c478b2fcb
author Ying Wang <wangying@google.com> Mon Sep 27 10:37:25 2010 -0700
committer Ying Wang <wangying@google.com> Mon Sep 27 10:37:25 2010 -0700
tree a67562669204c551b511db298cf3806a03fadb4a
parent 97984c41fe4f8fdca1f24c7bf790bf03b174f90e

Remove emulator-based dexpreopt logic from the build system.

Change-Id: Ic96cbd1ebb9fa65aa85bf77f18a31913625d7e1c

core/main.mk

diff --git a/core/main.mk b/core/main.mk
index 8a70489..81bebc8 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -224,9 +224,11 @@
   # TODO: Remove this and the corresponding block in
   # config/product_config.make once host-based Dalvik preoptimization is
   # working.
+  ifneq (true,$(DISABLE_DEXPREOPT))
   ifeq ($(HOST_OS)-$(WITH_DEXPREOPT_buildbot),linux-true)
     WITH_DEXPREOPT := true
   endif
+  endif
 
   # Disallow mock locations by default for user builds
   ADDITIONAL_DEFAULT_PROPERTIES += ro.allow.mock.location=0