From 3ebed36b0184f3ea1beaea17896c53e9d9623dcc Mon Sep 17 00:00:00 2001 From: Oleh Prypin Date: Fri, 27 Oct 2017 10:14:45 +0200 Subject: [PATCH] Roll chromium_revision f4ecd4bed3..f1b66c7b37 (508787:512062) + Windows fix Includes a fix for Windows build by mbonadei@: Adding rc to DEPS using checked-in hashes. https://webrtc-review.googlesource.com/14780 Change log: https://chromium.googlesource.com/chromium/src/+log/f4ecd4bed3..f1b66c7b37 Full diff: https://chromium.googlesource.com/chromium/src/+/f4ecd4bed3..f1b66c7b37 Changed dependencies: * src/base: https://chromium.googlesource.com/chromium/src/base/+log/041cecf43e..987a84e03a * src/build: https://chromium.googlesource.com/chromium/src/build/+log/8afa1551c5..e1ba03bda3 * src/buildtools: https://chromium.googlesource.com/chromium/buildtools.git/+log/f6d165d9d8..e043d81e91 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/f556c12cad..ef56503ef5 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/744b907c60..94d5c035a5 * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/96b848f800..bd60ce1398 * src/third_party/android_tools: https://chromium.googlesource.com/android_tools.git/+log/ca9dc7245b..110e5f6c0d * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/6f19655f67..52d748d48b * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/7de54ef0a2..781e71e49f * src/third_party/errorprone/lib: https://chromium.googlesource.com/chromium/third_party/errorprone.git/+log/6a55852cd7..16b8b7298b * src/third_party/ffmpeg: https://chromium.googlesource.com/chromium/third_party/ffmpeg.git/+log/3098b6a245..f9e8b42758 * src/third_party/gtest-parallel: https://chromium.googlesource.com/external/github.com/google/gtest-parallel/+log/ee20273811..3fee5ae8cb * src/third_party/libvpx/source/libvpx: https://chromium.googlesource.com/webm/libvpx.git/+log/caa116c9be..401e6d48bf * src/third_party/libyuv: https://chromium.googlesource.com/libyuv/libyuv.git/+log/5b1af9a335..8fa02df3c0 * src/third_party/lss: https://chromium.googlesource.com/linux-syscall-support.git/+log/63f24c8221..e6527b0cd4 * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/b6a9a695f5..8bff363f00 * src/tools/swarming_client: https://chromium.googlesource.com/infra/luci/client-py.git/+log/5e8001d9a7..fe94e7274e DEPS diff: https://chromium.googlesource.com/chromium/src/+/f4ecd4bed3..f1b66c7b37/DEPS Clang version changed 313786:315613 Details: https://chromium.googlesource.com/chromium/src/+/f4ecd4bed3..f1b66c7b37/tools/clang/scripts/update.py CQ_INCLUDE_TRYBOTS=master.internal.tryserver.corp.webrtc:linux_internal Bug: chromium:777448 Change-Id: I362bec887805f8d4a6649d57d752dcd34f0ea9c0 Reviewed-on: https://webrtc-review.googlesource.com/16422 Commit-Queue: Oleh Prypin Reviewed-by: Edward Lemur Cr-Commit-Position: refs/heads/master@{#20465} --- DEPS | 73 +++++++++++++++++++++++++++++++++++++++++++++--------------- 1 file changed, 55 insertions(+), 18 deletions(-) diff --git a/DEPS b/DEPS index ca5700e028..49e69f30f1 100644 --- a/DEPS +++ b/DEPS @@ -7,12 +7,12 @@ vars = { 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', 'webrtc_git': 'https://webrtc.googlesource.com', - 'chromium_revision': 'f4ecd4bed36c803a8ab88e44bd5a91bdd3d95d46', + 'chromium_revision': 'f1b66c7b37aa2c83d34e8193aba46ebe2444ed52', 'boringssl_git': 'https://boringssl.googlesource.com', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling swarming_client # and whatever else without interference from each other. - 'swarming_revision': '5e8001d9a710121ce7a68efd0804430a34b4f9e4', + 'swarming_revision': 'fe94e7274e40e2e929cdbc8787836f70d38de1f1', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling openmax_dl # and whatever else without interference from each other. @@ -24,11 +24,11 @@ vars = { # Three lines of non-changing comments so that # the commit queue can handle CLs rolling lss # and whatever else without interference from each other. - 'lss_revision': '63f24c8221a229f677d26ebe8f3d1528a9d787ac', + 'lss_revision': 'e6527b0cd469e3ff5764785dadcb39bf7d787154', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling catapult # and whatever else without interference from each other. - 'catapult_revision': '6f19655f67942d3b13000fdc157ddcf914186e7b', + 'catapult_revision': '52d748d48b4d5b334c0416954ac73f4c352b6627', # Three lines of non-changing comments so that # the commit queue can handle CLs rolling libFuzzer # and whatever else without interference from each other. @@ -38,11 +38,11 @@ deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - Var('chromium_git') + '/chromium/src/base' + '@' + '041cecf43e2ac84b85ebc1056d32428b0ad96ab9', + Var('chromium_git') + '/chromium/src/base' + '@' + '987a84e03a405adf15570e99ecfecda9dedb6b57', 'src/build': - Var('chromium_git') + '/chromium/src/build' + '@' + '8afa1551c53021d42a9805be6ceeae90e70eab9d', + Var('chromium_git') + '/chromium/src/build' + '@' + 'e1ba03bda35e37f9d7c620b8d5ed28fee0314c42', 'src/buildtools': - Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'f6d165d9d842ddd29056c127a5f3a3c5d8e0d2e3', + Var('chromium_git') + '/chromium/buildtools.git' + '@' + 'e043d81e9185a2445fa3ec3fc34a4f69b58d4969', # Gradle 3.5.0. Used for testing Android Studio project generation for WebRTC. 'src/examples/androidtests/third_party/gradle': { 'url': Var('chromium_git') + '/external/github.com/gradle/gradle.git' + '@' + @@ -50,15 +50,15 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'f556c12cad23e329310fafa8f3917829f66ef773', + 'url': Var('chromium_git') + '/chromium/src/ios' + '@' + 'ef56503ef5608d88e230a307eb8b9b7849defac9', 'condition': 'checkout_ios', }, 'src/testing': - Var('chromium_git') + '/chromium/src/testing' + '@' + '744b907c601d9d574422519da02c3d67fd477335', + Var('chromium_git') + '/chromium/src/testing' + '@' + '94d5c035a5198a079f8ced92b3f059200559d614', 'src/third_party': - Var('chromium_git') + '/chromium/src/third_party' + '@' + '96b848f8000b99c6486348689299320f3f700a47', + Var('chromium_git') + '/chromium/src/third_party' + '@' + 'bd60ce13981eeb56e2cd65e3418e31556f8b4358', 'src/third_party/android_tools': { - 'url': Var('chromium_git') + '/android_tools.git' + '@' + 'ca9dc7245b888c75307f0619e4a39fb46a82de66', + 'url': Var('chromium_git') + '/android_tools.git' + '@' + '110e5f6c0dcb6f7d586ac0c00f10bc7d1d410088', 'condition': 'checkout_android', }, 'src/third_party/boringssl/src': @@ -72,16 +72,16 @@ deps = { 'src/third_party/colorama/src': Var('chromium_git') + '/external/colorama.git' + '@' + '799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '7de54ef0a25f546747ea9f2a536d5cb175abc566', + Var('chromium_git') + '/chromium/tools/depot_tools.git' + '@' + '781e71e49fe543b1d8791750a0a6cd870ef7fdef', 'src/third_party/errorprone/lib': { - 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '6a55852cd7d1ef2f05a75d300495143be2a051d4', + 'url': Var('chromium_git') + '/chromium/third_party/errorprone.git' + '@' + '16b8b7298b183312a2fcac99fb1b594ccf7749d0', 'condition': 'checkout_android', }, 'src/third_party/ffmpeg': - Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '3098b6a24547c66d20ffd8448f6a719f41f87b95', + Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + 'f9e8b4275837a3859988351b70d5d1e045838da8', # WebRTC-only dependency (not present in Chromium). 'src/third_party/gtest-parallel': - Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + 'ee2027381105650fb1c66b2b121ba00b79e84d5c', + Var('chromium_git') + '/external/github.com/google/gtest-parallel' + '@' + '3fee5ae8cb990b383e10f9903c06e71a540f693c', 'src/third_party/googletest/src': Var('chromium_git') + '/external/github.com/google/googletest.git' + '@' + '7f8fefabedf2965980585be8c2bff97458f28e0b', 'src/third_party/icu': { @@ -105,9 +105,9 @@ deps = { 'src/third_party/libsrtp': Var('chromium_git') + '/chromium/deps/libsrtp.git' + '@' + '1d45b8e599dc2db6ea3ae22dbc94a8c504652423', 'src/third_party/libvpx/source/libvpx': - Var('chromium_git') + '/webm/libvpx.git' + '@' + 'caa116c9be96508c18d533dedc95b2df4f8e3812', + Var('chromium_git') + '/webm/libvpx.git' + '@' + '401e6d48bfd3cbf74a41da724d05c989e207662b', 'src/third_party/libyuv': - Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '5b1af9a33545895ea12c52bf007f17914de19173', + Var('chromium_git') + '/libyuv/libyuv.git' + '@' + '8fa02df3c0591754958a50cc2896aafae319f3bc', 'src/third_party/lss': { 'url': Var('chromium_git') + '/linux-syscall-support.git' + '@' + Var('lss_revision'), 'condition': 'checkout_android or checkout_linux', @@ -147,7 +147,7 @@ deps = { 'src/third_party/yasm/source/patched-yasm': Var('chromium_git') + '/chromium/deps/yasm/patched-yasm.git' + '@' + 'b98114e18d8b9b84586b10d24353ab8616d4c5fc', 'src/tools': - Var('chromium_git') + '/chromium/src/tools' + '@' + 'b6a9a695f5d5bf331900cbd851b6b039a8322dfd', + Var('chromium_git') + '/chromium/src/tools' + '@' + '8bff363f009d484629c40d2a2c27e48288a66720', 'src/tools/gyp': Var('chromium_git') + '/external/gyp.git' + '@' + 'd61a9397e668fa9843c4aa7da9e79460fe590bfb', 'src/tools/swarming_client': @@ -306,6 +306,43 @@ hooks = [ '-s', 'src/buildtools/linux64/clang-format.sha1', ], }, + # Pull rc binaries using checked-in hashes. + { + 'name': 'rc_win', + 'pattern': '.', + 'condition': 'checkout_win and host_os == "win"', + 'action': [ 'python', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/win/rc.exe.sha1', + ], + }, + { + 'name': 'rc_mac', + 'pattern': '.', + 'condition': 'checkout_win and host_os == "mac"', + 'action': [ 'python', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/mac/rc.sha1', + ], + }, + { + 'name': 'rc_linux', + 'pattern': '.', + 'condition': 'checkout_win and host_os == "linux"', + 'action': [ 'python', + 'src/third_party/depot_tools/download_from_google_storage.py', + '--no_resume', + '--no_auth', + '--bucket', 'chromium-browser-clang/rc', + '-s', 'src/build/toolchain/win/rc/linux64/rc.sha1', + ], + }, # Pull luci-go binaries (isolate, swarming) using checked-in hashes. { 'name': 'luci-go_win',