commit 61ae414dc086a0437701ab80c1260611a88af04a
author Elliott Hughes <enh@google.com> Sun Sep 11 15:57:29 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Sun Sep 11 15:57:29 2011 -0700
tree f5b000645aebb32e8d79bed33442aebf7276a1b6
parent 56778d8117d268867c054097bfda51f78a473c42
parent 2bb97f9191df2fece8d138a9b78e2ec7d532877e

Merge "Fix debugging output for unresolved fields." into dalvik-dev

Android.mk

diff --git a/Android.mk b/Android.mk
index 462aa29..4543042 100644
--- a/Android.mk
+++ b/Android.mk
@@ -21,8 +21,13 @@
 # enable/disable certain build configuration.
 ART_BUILD_TARGET_NDEBUG ?= true
 ART_BUILD_TARGET_DEBUG ?= true
-ART_BUILD_HOST_NDEBUG ?= true
-ART_BUILD_HOST_DEBUG ?= true
+ifeq ($(HOST_OS),linux)
+  ART_BUILD_HOST_NDEBUG ?= true
+  ART_BUILD_HOST_DEBUG ?= true
+else
+  ART_BUILD_HOST_NDEBUG ?= false
+  ART_BUILD_HOST_DEBUG ?= false
+endif
 
 build_path := $(LOCAL_PATH)/build
 include $(build_path)/Android.common.mk