Commit Graph

4 Commits

Author SHA1 Message Date
9e65a3b013 Re-land webrtcmediaengine.cc part of r6397.
webrtcvideoengine.cc un-reverted by a bot roll in r6399 so half of r6397
is still applied. The applied fix (diff between r6397) is to put
WebRtcVideoEngine2 in ifdefs and only build for WEBRTC_CHROMIUM_BUILDs
corresponding to webrtcmediaengine.h.

BUG=
R=minyue@webrtc.org
TBR=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19719005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6401 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-11 13:42:37 +00:00
6604c6df26 Revert 6397 "(Auto)update libjingle 68949184-> 68982444"
> (Auto)update libjingle 68949184-> 68982444

TBR=buildbot@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19739004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6398 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-11 13:02:36 +00:00
af214d804f (Auto)update libjingle 68949184-> 68982444
git-svn-id: http://webrtc.googlecode.com/svn/trunk@6397 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-11 12:46:49 +00:00
289a35c56d Add empty webrtcmediaengine.cc.
Should contain CreateWebRtcMediaEngine as soon as
libjingle/libjingle.gyp in Chromium builds this file. This file is added
ahead of time to get a smoother rolling process.

BUG=1788
R=tommi@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/19599005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@6313 4adac7df-926f-26a2-2b94-8c16560cd09d
2014-06-03 14:51:34 +00:00