From 87f8a7eb67e2948208a422c9e2d0cc45e7f3489e Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Wed, 24 Jul 2013 20:15:43 +0000 Subject: [PATCH] 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 git-svn-id: http://webrtc.googlecode.com/svn/trunk@4391 4adac7df-926f-26a2-2b94-8c16560cd09d --- DEPS | 4 ++-- talk/app/webrtc/java/jni/peerconnection_jni.cc | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 7fc3b460fa..127c600f8a 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": "212975", # 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@211873", + Var("chromium_trunk") + "/deps/third_party/libvpx@212975", "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 d6a8b589d1..fa7418c37d 100644 --- a/talk/app/webrtc/java/jni/peerconnection_jni.cc +++ b/talk/app/webrtc/java/jni/peerconnection_jni.cc @@ -1,6 +1,6 @@ /* * libjingle - * Copyright 2013, Google Inc. + * Copyright 2013 Google Inc. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions are met: @@ -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"