summaryrefslogtreecommitdiff
path: root/system_wrappers/source/cpu_features_android.target.linux-arm.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-06-09 17:44:56 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-06-09 17:44:56 +0000
commit8097a46312f4050f2629558f1d37ec5b3100eb6e (patch)
treed7571f88cf19a16d4d2c4ab84e561cef93e58c1d /system_wrappers/source/cpu_features_android.target.linux-arm.mk
parent20d9f0061bc129329e0f2900d0c7f9ad500e4c74 (diff)
downloadwebrtc-8097a46312f4050f2629558f1d37ec5b3100eb6e.tar.gz
Update makefiles after merge of Chromium at 275833
This commit was generated by merge_from_chromium.py. Change-Id: Iad0f8b40d3547d8d6337888a84071a951f8302d6
Diffstat (limited to 'system_wrappers/source/cpu_features_android.target.linux-arm.mk')
-rw-r--r--system_wrappers/source/cpu_features_android.target.linux-arm.mk2
1 files changed, 2 insertions, 0 deletions
diff --git a/system_wrappers/source/cpu_features_android.target.linux-arm.mk b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
index 79fbf62c..cc26fe5e 100644
--- a/system_wrappers/source/cpu_features_android.target.linux-arm.mk
+++ b/system_wrappers/source/cpu_features_android.target.linux-arm.mk
@@ -270,6 +270,7 @@ LOCAL_LDFLAGS_Debug := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,--warn-shared-textrel \
-Wl,-O1 \
@@ -287,6 +288,7 @@ LOCAL_LDFLAGS_Release := \
-fuse-ld=gold \
-nostdlib \
-Wl,--no-undefined \
+ -Wl,--exclude-libs=ALL \
-Wl,--icf=safe \
-Wl,-O1 \
-Wl,--as-needed \