diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2013-07-03 20:21:11 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2013-07-03 20:21:11 +0000 |
| commit | 13f6617652072d051fd7a273072217f34c26d145 (patch) | |
| tree | ccdc315b743cae9e13ca276c1984f08f6fdca8d5 | |
| parent | 04bec100f832b41a901f902b6e740590a5cd5e39 (diff) | |
| download | freetype-13f6617652072d051fd7a273072217f34c26d145.tar.gz | |
Update makefiles after merge of Chromium at r210032
This commit was generated by merge_from_chromium.py.
Change-Id: I695b54c29b8b0ab8b220f0c573251098a8ea464a
| -rw-r--r-- | ft2.target.darwin-arm.mk | 4 | ||||
| -rw-r--r-- | ft2.target.darwin-mips.mk | 4 | ||||
| -rw-r--r-- | ft2.target.darwin-x86.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-arm.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-mips.mk | 4 | ||||
| -rw-r--r-- | ft2.target.linux-x86.mk | 4 |
6 files changed, 6 insertions, 18 deletions
diff --git a/ft2.target.darwin-arm.mk b/ft2.target.darwin-arm.mk index e77c5c7..8c2f691 100644 --- a/ft2.target.darwin-arm.mk +++ b/ft2.target.darwin-arm.mk @@ -228,7 +228,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ -Wl,--gc-sections \ - -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -247,8 +246,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--icf=safe \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel + -Wl,--gc-sections LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/ft2.target.darwin-mips.mk b/ft2.target.darwin-mips.mk index 0d03843..162b9c1 100644 --- a/ft2.target.darwin-mips.mk +++ b/ft2.target.darwin-mips.mk @@ -224,7 +224,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--gc-sections \ - -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -241,8 +240,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel + -Wl,--gc-sections LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/ft2.target.darwin-x86.mk b/ft2.target.darwin-x86.mk index 396c0d1..c5cea49 100644 --- a/ft2.target.darwin-x86.mk +++ b/ft2.target.darwin-x86.mk @@ -230,7 +230,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--gc-sections \ - -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -247,8 +246,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel + -Wl,--gc-sections LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/ft2.target.linux-arm.mk b/ft2.target.linux-arm.mk index e77c5c7..8c2f691 100644 --- a/ft2.target.linux-arm.mk +++ b/ft2.target.linux-arm.mk @@ -228,7 +228,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ -Wl,--gc-sections \ - -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -247,8 +246,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--icf=safe \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel + -Wl,--gc-sections LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/ft2.target.linux-mips.mk b/ft2.target.linux-mips.mk index 0d03843..162b9c1 100644 --- a/ft2.target.linux-mips.mk +++ b/ft2.target.linux-mips.mk @@ -224,7 +224,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--gc-sections \ - -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -241,8 +240,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel + -Wl,--gc-sections LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/ft2.target.linux-x86.mk b/ft2.target.linux-x86.mk index 396c0d1..c5cea49 100644 --- a/ft2.target.linux-x86.mk +++ b/ft2.target.linux-x86.mk @@ -230,7 +230,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--gc-sections \ - -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -247,8 +246,7 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections \ - -Wl,--warn-shared-textrel + -Wl,--gc-sections LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) |