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

Revert 4391 "Roll chromium 205140:212975 to support ninja iOS ar..."

Browse Source 
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
This commit is contained in:
turaj@webrtc.org 2013-07-25 17:48:24 +00:00
parent 8e3bbedacd
commit c46967dc53
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
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": "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",

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/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"