Roll Chromium 122775:132375 (current Canary).
Hijacking the gyp inside_chromium_build finally came back to bite us. Chrome started using it to control the path to the gold linker, which broke our build. This change removes use of inside_chromium_build from WebRTC. If peerconnection rolls past this point, libjingle.gyp will need to be updated. BUG= TEST=build on Linux, Mac, Win Review URL: https://webrtc-codereview.appspot.com/493007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2038 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
@@ -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,
|
||||
}
|
||||
}
|
||||
"""
|
||||
|
||||
Reference in New Issue
Block a user