Roll chromium_revision bb79186..5d149df (353481:354955)

Changelog: bb79186..5d149df

TBR=fbarchard@chromium.org

Review URL: https://codereview.chromium.org/1416823002 .
This commit is contained in:
Henrik Kjellander 2015-10-20 07:54:41 +02:00
parent e6a54f223a
commit 97ec206e74
4 changed files with 30 additions and 3 deletions

2
DEPS
View File

@ -7,7 +7,7 @@ vars = {
# Roll the Chromium Git hash to pick up newer versions of all the
# dependencies and tools linked to in setup_links.py.
'chromium_revision': 'bb79186c63ff4eff7a2a318a21731005c53f269b',
'chromium_revision': '5d149df075245e393f84d63825f812b66cbe042d',
}
# NOTE: Prefer revision numbers to tags for svn deps. Use http rather than

View File

@ -9,9 +9,14 @@ solutions = [{
'src/chrome/tools/test/reference_build/chrome_mac': None,
'src/chrome/tools/test/reference_build/chrome_win': None,
'src/native_client': None,
'src/third_party/cld_2/src': None,
'src/third_party/ffmpeg': None,
'src/third_party/WebKit': None,
'src/v8': None,
'src/third_party/hunspell_dictionaries': None,
'src/third_party/liblouis/src': None,
'src/third_party/pdfium': None,
'src/third_party/skia': None,
'src/third_party/trace-viewer': None,
'src/third_party/webrtc': None,
},
'safesync_url': ''
}]

View File

@ -0,0 +1,7 @@
This is a dummy configuration file to workaround the assumption of the grit
resource file being located here in the Chromium build toolchain.
This is only needed for our Android native tests to be able to include the
build/apk_test.gypi GYP file and depend on the
<(DEPTH)/testing/android/native_test.gyp:native_test_native_code target in
Chromium.

View File

@ -0,0 +1,15 @@
# Copyright (c) 2015 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.
{
"SRCDIR": "../..",
"chromium/src/net/base/net_resources.grd": {
"includes": [4000],
},
}