summaryrefslogtreecommitdiffstats
path: root/content
diff options
context:
space:
mode:
authorwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-16 01:53:13 +0000
committerwjia@chromium.org <wjia@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-07-16 01:53:13 +0000
commit4262d8746c56c7871e820893daf414ff9865b25f (patch)
treeb47995b0b0661165fa935177dffd7b7fb564b793 /content
parentc1f61c985ffee1b92dc8ad085a6219bf22a1686a (diff)
downloadchromium_src-4262d8746c56c7871e820893daf414ff9865b25f.zip
chromium_src-4262d8746c56c7871e820893daf414ff9865b25f.tar.gz
chromium_src-4262d8746c56c7871e820893daf414ff9865b25f.tar.bz2
roll webrtc to r218 and enable webrtc build.
This is the first step to land http://codereview.chromium.org/7204008/. Have tried ARM build locally. BUG=none TEST=trybots Review URL: http://codereview.chromium.org/7398009 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@92781 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content')
-rw-r--r--content/content_renderer.gypi4
1 files changed, 4 insertions, 0 deletions
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 3836edc..dbbac54 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -20,6 +20,10 @@
'../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',
],