Update makefiles after merge of Chromium at 275661

This commit was generated by merge_from_chromium.py.

Change-Id: Iab25f749b82709452754cc0ca9ecfd43a6fd4a7b

10 files changed, 0 insertions, 20 deletions

diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk
index 37dc1d8..ce76a3d 100644
--- a/openssl.target.darwin-arm.mk
+++ b/openssl.target.darwin-arm.mk
@@ -832,7 +832,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
@@ -850,7 +849,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/openssl.target.darwin-arm64.mk b/openssl.target.darwin-arm64.mk
index 44ad10f..427f7ee 100644
--- a/openssl.target.darwin-arm64.mk
+++ b/openssl.target.darwin-arm64.mk
@@ -786,7 +786,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -800,7 +799,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk
index 4aea3a2..7b3ec59 100644
--- a/openssl.target.darwin-mips.mk
+++ b/openssl.target.darwin-mips.mk
@@ -809,7 +809,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
@@ -825,7 +824,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/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk
index 2ba6a3b..d3cca62 100644
--- a/openssl.target.darwin-x86.mk
+++ b/openssl.target.darwin-x86.mk
@@ -831,7 +831,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -847,7 +846,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/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk
index abea39a..d209a66 100644
--- a/openssl.target.darwin-x86_64.mk
+++ b/openssl.target.darwin-x86_64.mk
@@ -832,7 +832,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -848,7 +847,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/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk
index 37dc1d8..ce76a3d 100644
--- a/openssl.target.linux-arm.mk
+++ b/openssl.target.linux-arm.mk
@@ -832,7 +832,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--icf=safe \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
@@ -850,7 +849,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/openssl.target.linux-arm64.mk b/openssl.target.linux-arm64.mk
index 44ad10f..427f7ee 100644
--- a/openssl.target.linux-arm64.mk
+++ b/openssl.target.linux-arm64.mk
@@ -786,7 +786,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -800,7 +799,6 @@ LOCAL_LDFLAGS_Release := \
 	-fPIC \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \
diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk
index 4aea3a2..7b3ec59 100644
--- a/openssl.target.linux-mips.mk
+++ b/openssl.target.linux-mips.mk
@@ -809,7 +809,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
@@ -825,7 +824,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/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk
index 2ba6a3b..d3cca62 100644
--- a/openssl.target.linux-x86.mk
+++ b/openssl.target.linux-x86.mk
@@ -831,7 +831,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -847,7 +846,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/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk
index abea39a..d209a66 100644
--- a/openssl.target.linux-x86_64.mk
+++ b/openssl.target.linux-x86_64.mk
@@ -832,7 +832,6 @@ LOCAL_LDFLAGS_Debug := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,--warn-shared-textrel \
 	-Wl,-O1 \
 	-Wl,--as-needed
@@ -848,7 +847,6 @@ LOCAL_LDFLAGS_Release := \
 	-fuse-ld=gold \
 	-nostdlib \
 	-Wl,--no-undefined \
-	-Wl,--exclude-libs=ALL \
 	-Wl,-O1 \
 	-Wl,--as-needed \
 	-Wl,--gc-sections \