commit 9a3dfc06b94a59bdc7005a8a944996c956527c19
author Jean-Baptiste Queru <jbq@google.com> Fri Oct 28 15:27:07 2011 +0000
committer Android Git Automerger <android-git-automerger@android.com> Fri Oct 28 15:27:07 2011 +0000
tree b7a76062aa4ef79f679e6a510a19e311ea2cc8a1
parent 386388581bb866cae7809feaac5b685d8e90ac4f
parent 68eb6649fe703b083c51356526f92e4e219dc140

am 68eb6649: am 432f8d88: Reconcile with AOSP master

* commit '68eb6649fe703b083c51356526f92e4e219dc140':

core/combo/HOST_linux-x86.mk

diff --git a/core/combo/HOST_linux-x86.mk b/core/combo/HOST_linux-x86.mk
index 7df2893..5ae4972 100644
--- a/core/combo/HOST_linux-x86.mk
+++ b/core/combo/HOST_linux-x86.mk
@@ -53,6 +53,6 @@
 	-include $(call select-android-config-h,linux-x86)
 
 # Disable new longjmp in glibc 2.11 and later. See bug 2967937.
-HOST_GLOBAL_CFLAGS += -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=0
+HOST_GLOBAL_CFLAGS += -D_FORTIFY_SOURCE=0
 
 HOST_NO_UNDEFINED_LDFLAGS := -Wl,--no-undefined