Update makefiles after merge of Chromium at 232403
This commit was generated by merge_from_chromium.py.
Change-Id: I3e405a8cd2f1ce571b85b4e7433aad03ca50919e
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 855f9ac..590bf5c 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -71,11 +71,11 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
+ -fno-stack-protector \
-Wno-address \
-Wno-format-security \
-Wno-return-type \
-Wno-sequence-point \
- -fno-stack-protector \
-Os \
-g \
-fomit-frame-pointer \
@@ -156,11 +156,11 @@
-Wno-extra \
-Wno-ignored-qualifiers \
-Wno-type-limits \
+ -fno-stack-protector \
-Wno-address \
-Wno-format-security \
-Wno-return-type \
-Wno-sequence-point \
- -fno-stack-protector \
-Os \
-fno-ident \
-fdata-sections \