diff options
| author | Torne (Richard Coles) <torne@google.com> | 2013-09-05 17:00:58 +0100 |
|---|---|---|
| committer | Torne (Richard Coles) <torne@google.com> | 2013-09-05 17:00:58 +0100 |
| commit | 535d42a477c869427301df2d910dc53f07d6293b (patch) | |
| tree | 9535eb08ddd3ba06eeeb2c823ed1c604ac6bcc4c | |
| parent | bcc56e71cec794b856743025072cffc5380084b9 (diff) | |
| parent | 2f582775d4f2797691b069f7c53a225b35b5e497 (diff) | |
| download | openssl-535d42a477c869427301df2d910dc53f07d6293b.tar.gz | |
Merge from Chromium at DEPS revision 30.0.1599.31android-4.4_r0.7
This commit was generated by merge_to_master.py.
Change-Id: I0ec0b7f10c4b32b7f50291ced769c27645ebd5a2
| -rw-r--r-- | openssl.target.darwin-arm.mk | 6 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 6 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 6 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 6 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 6 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 6 |
6 files changed, 30 insertions, 6 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index de172e6..fdf1b7b 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -792,7 +792,9 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ + -Wl,--fatal-warnings \ -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -811,7 +813,9 @@ LOCAL_LDFLAGS_Release := \ -Wl,--icf=safe \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections + -Wl,--gc-sections \ + -Wl,--fatal-warnings \ + -Wl,--warn-shared-textrel LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 47c3755..b66b58c 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -781,7 +781,9 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ + -Wl,--fatal-warnings \ -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -798,7 +800,9 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections + -Wl,--gc-sections \ + -Wl,--fatal-warnings \ + -Wl,--warn-shared-textrel LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 2ae5f15..5c79010 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -809,7 +809,9 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ + -Wl,--fatal-warnings \ -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -826,7 +828,9 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections + -Wl,--gc-sections \ + -Wl,--fatal-warnings \ + -Wl,--warn-shared-textrel LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index de172e6..fdf1b7b 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -792,7 +792,9 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ + -Wl,--fatal-warnings \ -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -811,7 +813,9 @@ LOCAL_LDFLAGS_Release := \ -Wl,--icf=safe \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections + -Wl,--gc-sections \ + -Wl,--fatal-warnings \ + -Wl,--warn-shared-textrel LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 47c3755..b66b58c 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -781,7 +781,9 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ + -Wl,--fatal-warnings \ -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -798,7 +800,9 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections + -Wl,--gc-sections \ + -Wl,--fatal-warnings \ + -Wl,--warn-shared-textrel LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 2ae5f15..5c79010 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -809,7 +809,9 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ + -Wl,--fatal-warnings \ -Wl,--gc-sections \ + -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed @@ -826,7 +828,9 @@ LOCAL_LDFLAGS_Release := \ -Wl,--exclude-libs=ALL \ -Wl,-O1 \ -Wl,--as-needed \ - -Wl,--gc-sections + -Wl,--gc-sections \ + -Wl,--fatal-warnings \ + -Wl,--warn-shared-textrel LOCAL_LDFLAGS := $(LOCAL_LDFLAGS_$(GYP_CONFIGURATION)) |