Update makefiles after merge of Chromium at r194299
This commit was generated by merge_from_chromium.py.
Change-Id: I3bd431ae48ed4dcfee585b8baf70d68df6d27252
diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 9ff70de..98af923 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -142,9 +142,9 @@
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
+ -Wl,--gc-sections \
-Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--as-needed
LOCAL_STATIC_LIBRARIES :=