diff options
| author | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:17 +0000 |
|---|---|---|
| committer | Android Chromium Automerger <chromium-automerger@android> | 2014-10-15 16:19:17 +0000 |
| commit | c7266552448a93132e75d0c08eb847a8e9735065 (patch) | |
| tree | c88d62c89da96ae1600b45bea54c5e568c6d12d6 /modules/video_processing.target.linux-x86_64.mk | |
| parent | 2a5d481b5e821cff61bbdb7925603e551e9bdec1 (diff) | |
| download | webrtc-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 'modules/video_processing.target.linux-x86_64.mk')
| -rw-r--r-- | modules/video_processing.target.linux-x86_64.mk | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/modules/video_processing.target.linux-x86_64.mk b/modules/video_processing.target.linux-x86_64.mk index 8b1e1e80..eb5c346a 100644 --- a/modules/video_processing.target.linux-x86_64.mk +++ b/modules/video_processing.target.linux-x86_64.mk @@ -276,6 +276,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_modules_video_processing_gyp |