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