summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-09 17:44:56 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-09 17:44:56 +0000
commit79e79c858bd4641b2a516b5dfa0a4a23357e0d19 (patch)
tree0ee6578ad2e712760363e6dd2c9f8b242cebfdf3
parentf51889aaf5d4444e46f805fff626aab719a0ad1b (diff)
downloadfreetype-79e79c858bd4641b2a516b5dfa0a4a23357e0d19.tar.gz
Update makefiles after merge of Chromium at 275833
This commit was generated by merge_from_chromium.py. Change-Id: I3c33b116704c45e86519d863d16ba19d36508df1
-rw-r--r--ft2.target.darwin-arm.mk2
-rw-r--r--ft2.target.darwin-arm64.mk2
-rw-r--r--ft2.target.darwin-mips.mk2
-rw-r--r--ft2.target.darwin-x86.mk2
-rw-r--r--ft2.target.darwin-x86_64.mk2
-rw-r--r--ft2.target.linux-arm.mk2
-rw-r--r--ft2.target.linux-arm64.mk2
-rw-r--r--ft2.target.linux-mips.mk2
-rw-r--r--ft2.target.linux-x86.mk2
-rw-r--r--ft2.target.linux-x86_64.mk2
10 files changed, 20 insertions, 0 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk
index c4bc3be..f4ed6c9 100644
--- a/ft2.target.darwin-arm.mk
+++ b/ft2.target.darwin-arm.mk
@@ -274,6 +274,7 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -291,6 +292,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/ft2.target.darwin-arm64.mk b/ft2.target.darwin-arm64.mk
index e4711e5..0cdcfb4 100644
--- a/ft2.target.darwin-arm64.mk
+++ b/ft2.target.darwin-arm64.mk
@@ -249,6 +249,7 @@ LOCAL_LDFLAGS_Debug := \
-fPIC \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -262,6 +263,7 @@ LOCAL_LDFLAGS_Release := \
-fPIC \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk
index 9f75298..3349c05 100644
--- a/ft2.target.darwin-mips.mk
+++ b/ft2.target.darwin-mips.mk
@@ -263,6 +263,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
@@ -278,6 +279,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/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk
index 54d579f..2a8654e 100644
--- a/ft2.target.darwin-x86.mk
+++ b/ft2.target.darwin-x86.mk
@@ -261,6 +261,7 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -276,6 +277,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/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 0595702..8725fcc 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -259,6 +259,7 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -274,6 +275,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/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk
index c4bc3be..f4ed6c9 100644
--- a/ft2.target.linux-arm.mk
+++ b/ft2.target.linux-arm.mk
@@ -274,6 +274,7 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -291,6 +292,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/ft2.target.linux-arm64.mk b/ft2.target.linux-arm64.mk
index e4711e5..0cdcfb4 100644
--- a/ft2.target.linux-arm64.mk
+++ b/ft2.target.linux-arm64.mk
@@ -249,6 +249,7 @@ LOCAL_LDFLAGS_Debug := \
-fPIC \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -262,6 +263,7 @@ LOCAL_LDFLAGS_Release := \
-fPIC \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk
index 9f75298..3349c05 100644
--- a/ft2.target.linux-mips.mk
+++ b/ft2.target.linux-mips.mk
@@ -263,6 +263,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
@@ -278,6 +279,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/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk
index 54d579f..2a8654e 100644
--- a/ft2.target.linux-x86.mk
+++ b/ft2.target.linux-x86.mk
@@ -261,6 +261,7 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -276,6 +277,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/ft2.target.linux-x86_64.mk b/ft2.target.linux-x86_64.mk
index 0595702..8725fcc 100644
--- a/ft2.target.linux-x86_64.mk
+++ b/ft2.target.linux-x86_64.mk
@@ -259,6 +259,7 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -274,6 +275,7 @@ LOCAL_LDFLAGS_Release := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \