Update makefiles after merge of Chromium at 275833

This commit was generated by merge_from_chromium.py.

Change-Id: Ib2aa24866b083a6f64cf2c311785ca9bbaa46288

10 files changed, 20 insertions, 0 deletions

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