Update makefiles after merge of Chromium at r194299
This commit was generated by merge_from_chromium.py.
Change-Id: Id11dc75f0224de924e9a3f44de3b34ec003e982d
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index 21d66a1..aea3d74 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -149,9 +149,9 @@
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
+ -Wl,--gc-sections \
-Wl,-O1 \
- -Wl,--as-needed \
- -Wl,--gc-sections
+ -Wl,--as-needed
LOCAL_STATIC_LIBRARIES :=
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index 7584056..2024b1c 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -148,9 +148,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 :=