Update makefiles after merge of Chromium at 275661

This commit was generated by merge_from_chromium.py.

Change-Id: Icde89d3e546b64272550a805ec5793aeff96bcf5

10 files changed, 0 insertions, 20 deletions

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