diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 17:57:40 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-04-23 17:57:40 +0000 |
| commit | 6d4638462ec4422dd6a22a57b73d05ddfb093854 (patch) | |
| tree | f765b5d319d09ef69cf944850137955e92c8215c | |
| parent | c5681d99d38dde39912c1d659f528905dfecab96 (diff) | |
| download | openssl-6d4638462ec4422dd6a22a57b73d05ddfb093854.tar.gz | |
Update makefiles after merge of Chromium at 265680
This commit was generated by merge_from_chromium.py.
Change-Id: I2d8f8ca09ff5194929241247cbabca0107824490
| -rw-r--r-- | openssl.target.darwin-arm.mk | 1 | ||||
| -rw-r--r-- | openssl.target.darwin-mips.mk | 1 | ||||
| -rw-r--r-- | openssl.target.darwin-x86.mk | 1 | ||||
| -rw-r--r-- | openssl.target.darwin-x86_64.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-arm.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-mips.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-x86.mk | 1 | ||||
| -rw-r--r-- | openssl.target.linux-x86_64.mk | 1 |
8 files changed, 0 insertions, 8 deletions
diff --git a/openssl.target.darwin-arm.mk b/openssl.target.darwin-arm.mk index 8821416..a1aa51d 100644 --- a/openssl.target.darwin-arm.mk +++ b/openssl.target.darwin-arm.mk @@ -812,7 +812,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/openssl.target.darwin-mips.mk b/openssl.target.darwin-mips.mk index 6a375a6..55a213f 100644 --- a/openssl.target.darwin-mips.mk +++ b/openssl.target.darwin-mips.mk @@ -798,7 +798,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/openssl.target.darwin-x86.mk b/openssl.target.darwin-x86.mk index 5ddc046..f97f1fc 100644 --- a/openssl.target.darwin-x86.mk +++ b/openssl.target.darwin-x86.mk @@ -822,7 +822,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/openssl.target.darwin-x86_64.mk b/openssl.target.darwin-x86_64.mk index 258a3bb..8428dbd 100644 --- a/openssl.target.darwin-x86_64.mk +++ b/openssl.target.darwin-x86_64.mk @@ -825,7 +825,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/openssl.target.linux-arm.mk b/openssl.target.linux-arm.mk index 8821416..a1aa51d 100644 --- a/openssl.target.linux-arm.mk +++ b/openssl.target.linux-arm.mk @@ -812,7 +812,6 @@ LOCAL_LDFLAGS_Debug := \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ -Wl,--icf=safe \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/openssl.target.linux-mips.mk b/openssl.target.linux-mips.mk index 6a375a6..55a213f 100644 --- a/openssl.target.linux-mips.mk +++ b/openssl.target.linux-mips.mk @@ -798,7 +798,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/openssl.target.linux-x86.mk b/openssl.target.linux-x86.mk index 5ddc046..f97f1fc 100644 --- a/openssl.target.linux-x86.mk +++ b/openssl.target.linux-x86.mk @@ -822,7 +822,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed diff --git a/openssl.target.linux-x86_64.mk b/openssl.target.linux-x86_64.mk index 258a3bb..8428dbd 100644 --- a/openssl.target.linux-x86_64.mk +++ b/openssl.target.linux-x86_64.mk @@ -825,7 +825,6 @@ LOCAL_LDFLAGS_Debug := \ -nostdlib \ -Wl,--no-undefined \ -Wl,--exclude-libs=ALL \ - -Wl,--gc-sections \ -Wl,--warn-shared-textrel \ -Wl,-O1 \ -Wl,--as-needed |