From: Ying Wang <wangying@google.com>
Date: Tue, 5 Jun 2012 22:44:21 +0000 (-0700)
Subject: resolved conflicts for merge of 9f4d00b9 to master
X-Git-Tag: android-x86-4.4-r1~1031
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=130ae6adcb418d461b78d6667527137854f54592;p=android-x86%2Fbuild.git

resolved conflicts for merge of 9f4d00b9 to master

Change-Id: I1818896ae714aa54ad980bfbf7648652369497e5
---

130ae6adcb418d461b78d6667527137854f54592
diff --cc core/combo/HOST_darwin-x86.mk
index c84e375f7,00b532f3e..229eaf0bf
--- a/core/combo/HOST_darwin-x86.mk
+++ b/core/combo/HOST_darwin-x86.mk
@@@ -69,7 -64,7 +69,7 @@@ HOST_SHLIB_SUFFIX := .dyli
  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