generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Roll chromium_revision 205140:214260 to pick up build fixes for ninja iOS device build.

Browse Source 
TESTED=git try
BUG=2106
R=wu@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@4431 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2013-07-30 17:14:35 +00:00
parent 9638564340
commit 3d496fb046
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
DEPS
View File

@ -10,7 +10,7 @@ vars = {
# If you do not know, use the full path while defining your new deps entry.
"googlecode_url": "http://%s.googlecode.com/svn",
"chromium_trunk" : "http://src.chromium.org/svn/trunk",
"chromium_revision": "205140",
"chromium_revision": "214260",
# A small subset of WebKit is needed for the Android Python test framework.
"webkit_trunk": "http://src.chromium.org/blink/trunk",

2
talk/app/webrtc/java/jni/peerconnection_jni.cc
View File

@ -68,7 +68,7 @@
#include "talk/media/base/videorenderer.h"
#include "talk/media/devices/videorendererfactory.h"
#include "talk/media/webrtc/webrtcvideocapturer.h"
#include "third_party/icu/public/common/unicode/unistr.h"
#include "third_party/icu/source/common/unicode/unistr.h"
#include "webrtc/system_wrappers/interface/trace.h"
#include "webrtc/video_engine/include/vie_base.h"
#include "webrtc/voice_engine/include/voe_base.h"