commit 19e776ceb178397661b0323a9a982f6db249a56d
author Brian Carlstrom <bdc@google.com> Tue Jul 23 12:16:44 2013 -0700
committer Brian Carlstrom <bdc@google.com> Tue Jul 23 12:16:44 2013 -0700
tree f1e7911e08077dba585b61514d151f2854763f7c
parent 4560248d4c85cade7f4fc7b30c3fb41b95a04a7f

Enable darwin target build for art.

Change-Id: I8fc04258360d663d2fcd07c307fdfdd2981cdd19

dex2oat/Android.mk

diff --git a/dex2oat/Android.mk b/dex2oat/Android.mk
index 7bcf762..5cfab51 100644
--- a/dex2oat/Android.mk
+++ b/dex2oat/Android.mk
@@ -28,10 +28,12 @@
   $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,target,debug))
 endif
 
-# We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
-ifeq ($(ART_BUILD_NDEBUG),true)
-  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart-compiler,art/compiler,host,ndebug))
-endif
-ifeq ($(ART_BUILD_NDEBUG),true)
-  $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,host,debug))
+ifeq ($(WITH_HOST_DALVIK),true)
+  # We always build dex2oat and dependencies, even if the host build is otherwise disabled, since they are used to cross compile for the target.
+  ifeq ($(ART_BUILD_NDEBUG),true)
+    $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libart-compiler,art/compiler,host,ndebug))
+  endif
+  ifeq ($(ART_BUILD_NDEBUG),true)
+    $(eval $(call build-art-executable,dex2oat,$(DEX2OAT_SRC_FILES),libartd-compiler,art/compiler,host,debug))
+  endif
 endif