diff options
| author | Henrik Kjellander <kjellander@webrtc.org> | 2015-11-04 06:49:40 +0100 |
|---|---|---|
| committer | Henrik Kjellander <kjellander@webrtc.org> | 2015-11-04 05:49:47 +0000 |
| commit | 5af9a28bd6b8a6a9753a005fc2a53cfdc15e9a67 (patch) | |
| tree | 60294859985a9fd03082df1ef2c4b02ca4631e1b | |
| parent | 4b938e5c6965316ad3366abc81572d081c6e443f (diff) | |
| download | webrtc-5af9a28bd6b8a6a9753a005fc2a53cfdc15e9a67.tar.gz | |
Roll chromium_revision d131cac..a8b75a6 (357393:357542)
Change log: https://chromium.googlesource.com/chromium/src/+log/d131cac..a8b75a6
Full diff: https://chromium.googlesource.com/chromium/src/+/d131cac..a8b75a6
Changed dependencies:
* src/third_party/boringssl/src: https://boringssl.googlesource.com/boringssl.git/+log/51a01a5..2e0901b
DEPS diff: https://chromium.googlesource.com/chromium/src/+/d131cac..a8b75a6/DEPS
No update to Clang.
TBR=
CQ_EXTRA_TRYBOTS=tryserver.webrtc:win_baremetal,mac_baremetal,linux_baremetal
Review URL: https://codereview.webrtc.org/1408913003 .
Cr-Commit-Position: refs/heads/master@{#10499}
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | DEPS | 2 | ||||
| -rwxr-xr-x | setup_links.py | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index b29171c7d8..bd6afb84a6 100644 --- a/.gitignore +++ b/.gitignore @@ -39,6 +39,7 @@ /base /build /buildtools +/chrome /chromium/.gclient.tmp /chromium/.gclient.tmp_entries /chromium/.last_sync_chromium @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': 'd131cacd36ca82c0a866d8caed6dce0fed30f588', + 'chromium_revision': 'a8b75a6d21f35fc1b99578036114a998b50fc760', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/setup_links.py b/setup_links.py index 9aeb1e8764..5c980c595a 100755 --- a/setup_links.py +++ b/setup_links.py @@ -105,6 +105,7 @@ if 'ios' in target_os: DIRECTORIES.append('third_party/class-dump') FILES = { + 'chrome/VERSION': None, # TODO(kjellander): Get rid of this; webrtc:5160. 'tools/find_depot_tools.py': None, 'tools/isolate_driver.py': None, 'third_party/BUILD.gn': None, |