From: Andrew Hsieh <andrewhsieh@google.com>
Date: Wed, 12 Sep 2012 22:27:59 +0000 (-0700)
Subject: resolved conflicts for merge of 3e91f5ad to jb-mr1-dev
X-Git-Tag: android-x86-4.4-r1~457^2~1^2~63
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=5630521a;p=android-x86%2Fbuild.git

resolved conflicts for merge of 3e91f5ad to jb-mr1-dev

Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db
---

5630521aba12a03637e7328686924df4d298ff4d
diff --cc core/combo/TARGET_linux-x86.mk
index 1f6f96db1,9a6e08e23..96577f1c3
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@@ -93,11 -93,9 +93,12 @@@ TARGET_GLOBAL_CFLAGS += 
  			-fno-short-enums \
  			-fstrict-aliasing \
  			-funswitch-loops \
- 			-funwind-tables
+ 			-funwind-tables \
 -			-fstack-protector \
 -			-include $(call select-android-config-h,target_linux-x86)
++			-fstack-protector
 +
 +android_config_h := $(call select-android-config-h,target_linux-x86)
 +TARGET_ANDROID_CONFIG_CFLAGS := -include $(android_config_h) -I $(dir $(android_config_h))
 +TARGET_GLOBAL_CFLAGS += $(TARGET_ANDROID_CONFIG_CFLAGS)
  
  # XXX: Not sure this is still needed. Must check with our toolchains.
  TARGET_GLOBAL_CPPFLAGS += \