summaryrefslogtreecommitdiff
path: root/libsrtp.target.linux-x86.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-17 13:59:04 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-17 13:59:04 +0000
commit0aae06399cb553d01c0574a5bec8914684e47461 (patch)
treece7d8caf18dd90f4f155913f940d8b7d4a954be1 /libsrtp.target.linux-x86.mk
parent07578a28c9415d5f75130bebdcf3a9db3527a428 (diff)
downloadlibsrtp-0aae06399cb553d01c0574a5bec8914684e47461.tar.gz
Update makefiles after merge of Chromium at 257420
This commit was generated by merge_from_chromium.py. Change-Id: I6ec018bb733f1d67e1b9dac1611a386979f169a4
Diffstat (limited to 'libsrtp.target.linux-x86.mk')
-rw-r--r--libsrtp.target.linux-x86.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/libsrtp.target.linux-x86.mk b/libsrtp.target.linux-x86.mk
index 4a4833c..c67ee4c 100644
--- a/libsrtp.target.linux-x86.mk
+++ b/libsrtp.target.linux-x86.mk
@@ -261,6 +261,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
LOCAL_LDFLAGS_Debug := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -270,7 +271,6 @@ LOCAL_LDFLAGS_Debug := \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -278,6 +278,7 @@ LOCAL_LDFLAGS_Debug := \
LOCAL_LDFLAGS_Release := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -290,7 +291,6 @@ LOCAL_LDFLAGS_Release := \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel