commit 130ae6adcb418d461b78d6667527137854f54592
author Ying Wang <wangying@google.com> Tue Jun 05 15:44:21 2012 -0700
committer Ying Wang <wangying@google.com> Tue Jun 05 15:44:21 2012 -0700
tree ea76d2183cec1af6556b107302fe99c868a472f9
parent 3ec406191165b8e8711d0c4ce7211ea6d4d924dd
parent 9f4d00b94bb282bdcb1fdbc95dc006c5c52ca8db

resolved conflicts for merge of 9f4d00b9 to master

Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5

core/combo/HOST_darwin-x86.mk

diff --git a/core/combo/HOST_darwin-x86.mk b/core/combo/HOST_darwin-x86.mk
index c84e375..229eaf0 100644
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@ -69,7 +69,7 @@
 HOST_JNILIB_SUFFIX := .jnilib
 
 HOST_GLOBAL_CFLAGS += \
-	-include $(call select-android-config-h,darwin-x86)
+    -include $(call select-android-config-h,darwin-x86)
 ifneq ($(filter 10.7 10.7.% 10.8 10.8.%, $(build_mac_version)),)
        HOST_RUN_RANLIB_AFTER_COPYING := false
 else