commit 5630521aba12a03637e7328686924df4d298ff4d
author Andrew Hsieh <andrewhsieh@google.com> Wed Sep 12 15:27:59 2012 -0700
committer Andrew Hsieh <andrewhsieh@google.com> Wed Sep 12 15:27:59 2012 -0700
tree e98a11812008c753ac2e01e84f3301967532d221
parent 063d0c5deefc1cda1027a9241dbaf338cac35be0
parent 3e91f5ad763983af56f54d794045f451265f8d91

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

Change-Id: I9b587bc6086e1edacc98879e43668001bf72f7db

core/combo/TARGET_linux-x86.mk

diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk
index 1f6f96d..96577f1 100644
--- a/core/combo/TARGET_linux-x86.mk
+++ b/core/combo/TARGET_linux-x86.mk
@@ -93,7 +93,8 @@
 			-fno-short-enums \
 			-fstrict-aliasing \
 			-funswitch-loops \
-			-funwind-tables
+			-funwind-tables \
+			-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))