From b697cea0b6d6192c4d73c6701bae485bd1c4f9da Mon Sep 17 00:00:00 2001 From: Henrik Kjellander Date: Thu, 17 Sep 2015 06:44:43 +0200 Subject: [PATCH] Roll chromium_revision 5482f56..310ea93 (347609:349094) The WebKit dependency could be removed again after https://codereview.chromium.org/1338193003/ Relevant changes: * src/buildtools: 565d04e..f7310ee * src/third_party/boringssl/src: ac8302a..1d128f3 * src/third_party/libvpx: 0304cef..ac1772e * src/third_party/libyuv: 0bc626a..fcacbfb * src/third_party/mockito/src: ed99a52..4d987dc * src/tools/swarming_client: 2866a22..77f720b Details: https://chromium.googlesource.com/chromium/src/+/5482f56..310ea93/DEPS Clang version was not updated in this roll. TBR=marpan@webrtc.org Review URL: https://codereview.webrtc.org/1347153003 . Cr-Commit-Position: refs/heads/master@{#9962} --- .gn | 1 - DEPS | 2 +- chromium/.gclient | 1 + setup_links.py | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/.gn b/.gn index 738ed031f9..e15f3c5b8d 100644 --- a/.gn +++ b/.gn @@ -42,6 +42,5 @@ exec_script_whitelist = [ "//build/toolchain/win/BUILD.gn", "//third_party/boringssl/BUILD.gn", "//third_party/opus/BUILD.gn", - "//third_party/WebKit/Source/config.gni", "//webrtc/modules/video_render/BUILD.gn", ] diff --git a/DEPS b/DEPS index c862652a4e..e524512a7b 100644 --- a/DEPS +++ b/DEPS @@ -6,7 +6,7 @@ vars = { 'extra_gyp_flag': '-Dextra_gyp_flag=0', 'chromium_git': 'https://chromium.googlesource.com', - 'chromium_revision': '5482f563e441be7ab1cf59a02e3fd9e010e9535b', + 'chromium_revision': '310ea93837e4a95944fcd82ff54d0e0ea5186a2c', } # NOTE: Prefer revision numbers to tags for svn deps. Use http rather than diff --git a/chromium/.gclient b/chromium/.gclient index 7f46333e45..573a4558bf 100644 --- a/chromium/.gclient +++ b/chromium/.gclient @@ -17,6 +17,7 @@ solutions = [{ 'src/third_party/skia': None, 'src/third_party/trace-viewer': None, 'src/third_party/webrtc': None, + 'src/third_party/WebKit': None, }, 'safesync_url': '' }] diff --git a/setup_links.py b/setup_links.py index bc46202c17..1a155a7277 100755 --- a/setup_links.py +++ b/setup_links.py @@ -62,7 +62,6 @@ DIRECTORIES = [ 'third_party/sqlite', 'third_party/syzygy', 'third_party/usrsctp', - 'third_party/WebKit', 'third_party/yasm', 'third_party/zlib', 'tools/clang',