diff --git a/DEPS b/DEPS index 9dda6a86b0..d2284aeedc 100644 --- a/DEPS +++ b/DEPS @@ -3,7 +3,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": "122775", + "chromium_revision": "132375", # External resources like video and audio files used for testing purposes. # Downloaded on demand when needed. @@ -79,7 +79,7 @@ deps = { deps_os = { "win": { "trunk/third_party/cygwin": - Var("chromium_trunk") + "/deps/third_party/cygwin@66844", + From("trunk/chromium_deps", "src/third_party/cygwin"), # Used by libjpeg-turbo. "trunk/third_party/yasm/binaries": diff --git a/peerconnection/third_party/libjingle/libjingle.gyp b/peerconnection/third_party/libjingle/libjingle.gyp index 48939bf527..f49aa3e010 100644 --- a/peerconnection/third_party/libjingle/libjingle.gyp +++ b/peerconnection/third_party/libjingle/libjingle.gyp @@ -4,6 +4,7 @@ { # TODO(wu): Use the libjingle.gyp from chromium and get rid of this file. + # WebRTC no longer supports the inside_chromium_build variable. 'variables': { 'no_libjingle_logging%': 0, 'conditions': [ diff --git a/tools/create_supplement_gypi.py b/tools/create_supplement_gypi.py index f5a08e6192..7f996e7472 100644 --- a/tools/create_supplement_gypi.py +++ b/tools/create_supplement_gypi.py @@ -1,7 +1,11 @@ #!/usr/bin/env python -# Copyright (c) 2011 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. +# Copyright (c) 2012 The WebRTC project authors. All Rights Reserved. +# +# Use of this source code is governed by a BSD-style license +# that can be found in the LICENSE file in the root of the source +# tree. An additional intellectual property rights grant can be found +# in the file PATENTS. All contributing project authors may +# be found in the AUTHORS file in the root of the source tree. import sys @@ -11,7 +15,6 @@ supplement_gypi = """#!/usr/bin/env python { 'variables': { 'build_with_chromium': 0, - 'inside_chromium_build': 0, } } """