summaryrefslogtreecommitdiff
path: root/openssl.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-04-23 17:57:40 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-04-23 17:57:40 +0000
commit6d4638462ec4422dd6a22a57b73d05ddfb093854 (patch)
treef765b5d319d09ef69cf944850137955e92c8215c /openssl.target.linux-x86.mk
parentc5681d99d38dde39912c1d659f528905dfecab96 (diff)
downloadopenssl-6d4638462ec4422dd6a22a57b73d05ddfb093854.tar.gz
Update makefiles after merge of Chromium at 265680
This commit was generated by merge_from_chromium.py. Change-Id: I2d8f8ca09ff5194929241247cbabca0107824490
Diffstat (limited to 'openssl.target.linux-x86.mk')
-rw-r--r--openssl.target.linux-x86.mk1
1 files changed, 0 insertions, 1 deletions
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