summaryrefslogtreecommitdiff
path: root/modules/webrtc_video_coding.target.linux-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-03-17 13:59:05 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-03-17 13:59:05 +0000
commit4f684e9d5b3f522968e06dc7f27137e06e13eb49 (patch)
tree2f53e8c7b71986bc7a2e08ce6ee893136db7b644 /modules/webrtc_video_coding.target.linux-mips.mk
parentc5e7779a5fe0a0b2b8f14ce83ad5bcaccd9eeaf6 (diff)
downloadwebrtc-4f684e9d5b3f522968e06dc7f27137e06e13eb49.tar.gz
Update makefiles after merge of Chromium at 257420
This commit was generated by merge_from_chromium.py. Change-Id: I976ab11a93b7c30cb293371b90a8b50299b53d8f
Diffstat (limited to 'modules/webrtc_video_coding.target.linux-mips.mk')
-rw-r--r--modules/webrtc_video_coding.target.linux-mips.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/modules/webrtc_video_coding.target.linux-mips.mk b/modules/webrtc_video_coding.target.linux-mips.mk
index 46440e20..21fe2905 100644
--- a/modules/webrtc_video_coding.target.linux-mips.mk
+++ b/modules/webrtc_video_coding.target.linux-mips.mk
@@ -271,6 +271,7 @@ LOCAL_ASFLAGS := $(LOCAL_CFLAGS)
### Rules for final target.
LOCAL_LDFLAGS_Debug := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -280,7 +281,6 @@ LOCAL_LDFLAGS_Debug := \
-nostdlib \
-Wl,--no-undefined \
-Wl,--exclude-libs=ALL \
- -Wl,--fatal-warnings \
-Wl,--gc-sections \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -288,6 +288,7 @@ LOCAL_LDFLAGS_Debug := \
LOCAL_LDFLAGS_Release := \
+ -Wl,--fatal-warnings \
-Wl,-z,now \
-Wl,-z,relro \
-Wl,-z,noexecstack \
@@ -300,7 +301,6 @@ LOCAL_LDFLAGS_Release := \
-Wl,-O1 \
-Wl,--as-needed \
-Wl,--gc-sections \
- -Wl,--fatal-warnings \
-Wl,--warn-shared-textrel