diff options
| author | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 22:07:48 +0000 |
|---|---|---|
| committer | wjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-19 22:07:48 +0000 |
| commit | dda90ae68107defd1e2e8d2550475edb7793f3a1 (patch) | |
| tree | 6ed1e3746a68b3046f56e8b6b775b6f2cfdd6e0d | |
| parent | ebcc462bff6e2328dbae1fb6a42a3ffc3d2f0e4a (diff) | |
| download | chromium_src-dda90ae68107defd1e2e8d2550475edb7793f3a1.zip chromium_src-dda90ae68107defd1e2e8d2550475edb7793f3a1.tar.gz chromium_src-dda90ae68107defd1e2e8d2550475edb7793f3a1.tar.bz2 | |
add enable_webrtc in gyp to allow some platform to disable webrtc. enable_webrtc is set to 1 by default.
BUG=none
TEST=trybots
Review URL: http://codereview.chromium.org/7450003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@93108 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 4 | ||||
| -rw-r--r-- | content/content_renderer.gypi | 12 |
2 files changed, 12 insertions, 4 deletions
diff --git a/build/common.gypi b/build/common.gypi index c50b175..3cf0606 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -188,6 +188,9 @@ # Smooth scrolling is disabled by default. 'enable_smooth_scrolling%': 0, + # Webrtc compilation is enabled by default. Set to 0 to disable. + 'enable_webrtc%': 1, + 'conditions': [ # Use Skia as WebKit renderer on Mac ['OS=="mac"', { @@ -281,6 +284,7 @@ 'use_titlecase_in_grd_files%': '<(use_titlecase_in_grd_files)', 'use_third_party_translations%': '<(use_third_party_translations)', 'remoting%': '<(remoting)', + 'enable_webrtc%': '<(enable_webrtc)', 'p2p_apis%': '<(p2p_apis)', 'configuration_policy%': '<(configuration_policy)', 'safe_browsing%': '<(safe_browsing)', diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi index 66ca86d..33a13a1 100644 --- a/content/content_renderer.gypi +++ b/content/content_renderer.gypi @@ -20,10 +20,6 @@ '../third_party/libjingle/libjingle.gyp:libjingle_p2p', '../third_party/npapi/npapi.gyp:npapi', '../third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit', - '../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module', - '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', - '../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core', - '../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', '../ui/gfx/surface/surface.gyp:surface', '../v8/tools/gyp/v8.gyp:v8', ], @@ -209,6 +205,14 @@ ], }, }], + ['enable_webrtc==1', { + 'dependencies': [ + '../third_party/webrtc/modules/video_capture/main/source/video_capture.gyp:video_capture_module', + '../third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers', + '../third_party/webrtc/video_engine/main/source/video_engine_core.gyp:video_engine_core', + '../third_party/webrtc/voice_engine/main/source/voice_engine_core.gyp:voice_engine_core', + ], + }], ], }, ], |