summaryrefslogtreecommitdiff
path: root/ft2.target.darwin-x86_64.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-07 09:08:34 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-07 09:08:34 +0000
commitf51889aaf5d4444e46f805fff626aab719a0ad1b (patch)
tree9f14f630a59b2f57418ac3f94613dc5f3ded048c /ft2.target.darwin-x86_64.mk
parent8358ead68ac219c958ad4ebb39df8b5553c0e2ca (diff)
downloadfreetype-f51889aaf5d4444e46f805fff626aab719a0ad1b.tar.gz
Update makefiles after merge of Chromium at 275661
This commit was generated by merge_from_chromium.py. Change-Id: Id7615ee9114cf880afa900f7f3fe6e40ed88139a
Diffstat (limited to 'ft2.target.darwin-x86_64.mk')
-rw-r--r--ft2.target.darwin-x86_64.mk2
1 files changed, 0 insertions, 2 deletions
diff --git a/ft2.target.darwin-x86_64.mk b/ft2.target.darwin-x86_64.mk
index 8725fcc..0595702 100644
--- a/ft2.target.darwin-x86_64.mk
+++ b/ft2.target.darwin-x86_64.mk
@@ -259,7 +259,6 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
-Wl,--as-needed
@@ -275,7 +274,6 @@ LOCAL_LDFLAGS_Release := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
- -Wl,--exclude-libs=ALL \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \