Update makefiles after merge of Chromium at 275833

This commit was generated by merge_from_chromium.py.

Change-Id: Ieba4046d89804dff98abe0306d4ed0b6845ba57b

10 files changed, 20 insertions, 0 deletions

diff --git a/ots.target.darwin-arm.mk b/ots.target.darwin-arm.mk
index ead8ee6..786eea3 100644
--- a/ots.target.darwin-arm.mk
+++ b/ots.target.darwin-arm.mk
@@ -271,6 +271,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
@@ -288,6 +289,7 @@ LOCAL_LDFLAGS_Release := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
 	-Wl,-O1 \
 	-Wl,--as-needed \
diff --git a/ots.target.darwin-arm64.mk b/ots.target.darwin-arm64.mk
index 847af39..cca2770 100644
--- a/ots.target.darwin-arm64.mk
+++ b/ots.target.darwin-arm64.mk
@@ -246,6 +246,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -259,6 +260,7 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/ots.target.darwin-mips.mk b/ots.target.darwin-mips.mk
index 4c7e30d..3e8fd53 100644
--- a/ots.target.darwin-mips.mk
+++ b/ots.target.darwin-mips.mk
@@ -258,6 +258,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -273,6 +274,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/ots.target.darwin-x86.mk b/ots.target.darwin-x86.mk
index d60ff33..b4301ab 100644
--- a/ots.target.darwin-x86.mk
+++ b/ots.target.darwin-x86.mk
@@ -258,6 +258,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -273,6 +274,7 @@ LOCAL_LDFLAGS_Release := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/ots.target.darwin-x86_64.mk b/ots.target.darwin-x86_64.mk
index 7e337ab..e5f8ee5 100644
--- a/ots.target.darwin-x86_64.mk
+++ b/ots.target.darwin-x86_64.mk
@@ -256,6 +256,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -271,6 +272,7 @@ LOCAL_LDFLAGS_Release := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/ots.target.linux-arm.mk b/ots.target.linux-arm.mk
index ead8ee6..786eea3 100644
--- a/ots.target.linux-arm.mk
+++ b/ots.target.linux-arm.mk
@@ -271,6 +271,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
@@ -288,6 +289,7 @@ LOCAL_LDFLAGS_Release := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
 	-Wl,-O1 \
 	-Wl,--as-needed \
diff --git a/ots.target.linux-arm64.mk b/ots.target.linux-arm64.mk
index 847af39..cca2770 100644
--- a/ots.target.linux-arm64.mk
+++ b/ots.target.linux-arm64.mk
@@ -246,6 +246,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -259,6 +260,7 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/ots.target.linux-mips.mk b/ots.target.linux-mips.mk
index 4c7e30d..3e8fd53 100644
--- a/ots.target.linux-mips.mk
+++ b/ots.target.linux-mips.mk
@@ -258,6 +258,7 @@ LOCAL_LDFLAGS_Debug := \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -273,6 +274,7 @@ LOCAL_LDFLAGS_Release := \
 	-Wl,--no-keep-memory \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/ots.target.linux-x86.mk b/ots.target.linux-x86.mk
index d60ff33..b4301ab 100644
--- a/ots.target.linux-x86.mk
+++ b/ots.target.linux-x86.mk
@@ -258,6 +258,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -273,6 +274,7 @@ LOCAL_LDFLAGS_Release := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/ots.target.linux-x86_64.mk b/ots.target.linux-x86_64.mk
index 7e337ab..e5f8ee5 100644
--- a/ots.target.linux-x86_64.mk
+++ b/ots.target.linux-x86_64.mk
@@ -256,6 +256,7 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -271,6 +272,7 @@ LOCAL_LDFLAGS_Release := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
+	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \