summaryrefslogtreecommitdiff
path: root/webrtc.target.linux-mips.mk
diff options
context:
space:
mode:
authorAndroid Chromium Automerger <chromium-automerger@android>2014-10-15 16:19:17 +0000
committerAndroid Chromium Automerger <chromium-automerger@android>2014-10-15 16:19:17 +0000
commitc7266552448a93132e75d0c08eb847a8e9735065 (patch)
treec88d62c89da96ae1600b45bea54c5e568c6d12d6 /webrtc.target.linux-mips.mk
parent2a5d481b5e821cff61bbdb7925603e551e9bdec1 (diff)
downloadwebrtc-c7266552448a93132e75d0c08eb847a8e9735065.tar.gz
Update makefiles after merge of Chromium at 6e9c84566c9f
This commit was generated by merge_from_chromium.py. Change-Id: Ia99600712fa5534613907d4426663655656d2285
Diffstat (limited to 'webrtc.target.linux-mips.mk')
-rw-r--r--webrtc.target.linux-mips.mk3
1 files changed, 3 insertions, 0 deletions
diff --git a/webrtc.target.linux-mips.mk b/webrtc.target.linux-mips.mk
index 755f5736..3c043b27 100644
--- a/webrtc.target.linux-mips.mk
+++ b/webrtc.target.linux-mips.mk
@@ -258,6 +258,9 @@ LOCAL_SHARED_LIBRARIES := \
libstlport \
libdl
+### Set directly by aosp_build_settings.
+LOCAL_CLANG := false
+
# Add target alias to "gyp_all_modules" target.
.PHONY: gyp_all_modules
gyp_all_modules: third_party_webrtc_webrtc_gyp