diff options
| author | David Turner <digit@android.com> | 2011-06-06 14:39:32 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2011-06-06 14:39:32 -0700 |
| commit | 5d627263c8d685b351d1565d2c2d2a5e4896d63a (patch) | |
| tree | 2d0ac4c869bd3a29ff097c0d198f0db7a9440d92 /core/combo/TARGET_linux-x86.mk | |
| parent | 1081a05359cf75d8c7444a33c4c4a3a8d2b53140 (diff) | |
| parent | 0a2d335e99bae3c257c0e26fe180d00de04bebaa (diff) | |
| download | build-5d627263c8d685b351d1565d2c2d2a5e4896d63a.zip build-5d627263c8d685b351d1565d2c2d2a5e4896d63a.tar.gz build-5d627263c8d685b351d1565d2c2d2a5e4896d63a.tar.bz2 | |
am 0a2d335e: am c1705c9a: Merge "x86: Enable -fstack-protector"
* commit '0a2d335e99bae3c257c0e26fe180d00de04bebaa':
x86: Enable -fstack-protector
Diffstat (limited to 'core/combo/TARGET_linux-x86.mk')
| -rw-r--r-- | core/combo/TARGET_linux-x86.mk | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/core/combo/TARGET_linux-x86.mk b/core/combo/TARGET_linux-x86.mk index d8056e3..f4d40d1 100644 --- a/core/combo/TARGET_linux-x86.mk +++ b/core/combo/TARGET_linux-x86.mk @@ -91,9 +91,7 @@ TARGET_GLOBAL_CFLAGS += \ -funwind-tables \ -include $(call select-android-config-h,target_linux-x86) -# Needs to be fixed later -#TARGET_GLOBAL_CFLAGS += \ -# -fstack-protector +TARGET_GLOBAL_CFLAGS += -fstack-protector # Needs to be added for RELEASE #TARGET_GLOBAL_CFLAGS += \ |