From c46967dc53a5f54e0126ba0fe5fdeafd9b584a38 Mon Sep 17 00:00:00 2001 From: "turaj@webrtc.org" Date: Thu, 25 Jul 2013 17:48:24 +0000 Subject: [PATCH] Revert 4391 "Roll chromium 205140:212975 to support ninja iOS ar..." r4391 results in Mac Release Bot fail: http://chromegw/i/internal.client.webrtc/builders/Mac32%20Release/builds/334/steps/modules_integrationtests > Roll chromium 205140:212975 to support ninja iOS armv7 build. > > In particular, picks up new clang, libvpx, libsrtp, yasm, and gyp. > > TESTED=git try on patchset #1 > BUG=2106 > R=henrike@webrtc.org > > Review URL: https://webrtc-codereview.appspot.com/1849005 TBR=fischman@webrtc.org Review URL: https://webrtc-codereview.appspot.com/1874004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4399 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 4 ++-- talk/app/webrtc/java/jni/peerconnection_jni.cc | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/DEPS b/DEPS index 127c600f8a..7fc3b460fa 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": "212975", + "chromium_revision": "205140", # A small subset of WebKit is needed for the Android Python test framework. "webkit_trunk": "http://src.chromium.org/blink/trunk", @@ -66,7 +66,7 @@ deps = { From("chromium_deps", "src/third_party/libsrtp"), "third_party/libvpx": - Var("chromium_trunk") + "/deps/third_party/libvpx@212975", + Var("chromium_trunk") + "/deps/third_party/libvpx@211873", "third_party/libyuv": (Var("googlecode_url") % "libyuv") + "/trunk@723", diff --git a/talk/app/webrtc/java/jni/peerconnection_jni.cc b/talk/app/webrtc/java/jni/peerconnection_jni.cc index 1d3c9cd897..d6a8b589d1 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/source/common/unicode/unistr.h" +#include "third_party/icu/public/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"