From 3d496fb046bca52b8f5c9c194033dab1cdd550c4 Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Tue, 30 Jul 2013 17:14:35 +0000 Subject: [PATCH] Roll chromium_revision 205140:214260 to pick up build fixes for ninja iOS device build. 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 --- DEPS | 2 +- talk/app/webrtc/java/jni/peerconnection_jni.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/DEPS b/DEPS index f6d87dd95a..d961311cbf 100644 --- a/DEPS +++ b/DEPS @@ -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", diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index d6a8b589d1..1d3c9cd897 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -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"