From f4b956c02671188ba7f4f06a3a2b6ed271565115 Mon Sep 17 00:00:00 2001 From: Jeremy Leconte Date: Mon, 29 Jun 2020 09:58:17 +0200 Subject: [PATCH] Roll chromium_revision 71a0e1904e..51d47a5bb4 (782339:783422) Change log: https://chromium.googlesource.com/chromium/src/+log/71a0e1904e..51d47a5bb4 Full diff: https://chromium.googlesource.com/chromium/src/+/71a0e1904e..51d47a5bb4 Changed dependencies * src/base: https://chromium.googlesource.com/chromium/src/base/+log/736d9fb42c..057fa3c509 * src/build: https://chromium.googlesource.com/chromium/src/build/+log/ceecd92e25..d83f4a5f00 * src/ios: https://chromium.googlesource.com/chromium/src/ios/+log/73c8bcb1b1..3e01721325 * src/testing: https://chromium.googlesource.com/chromium/src/testing/+log/77ba7104d5..6cdbe3084b * src/third_party: https://chromium.googlesource.com/chromium/src/third_party/+log/1908162da7..9f9e479209 * src/third_party/catapult: https://chromium.googlesource.com/catapult.git/+log/e0658a4adf..a2a7e05eb7 * src/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools.git/+log/87c8b91639..6e6c67d0ea * src/third_party/perfetto: https://android.googlesource.com/platform/external/perfetto.git/+log/44e38c4643..3e2475b08d * src/tools: https://chromium.googlesource.com/chromium/src/tools/+log/d6998993f9..15b01f76a1 DEPS diff: https://chromium.googlesource.com/chromium/src/+/71a0e1904e..51d47a5bb4/DEPS Clang version changed 4e813bbdf:fb1aa286c1400ad7 Details: https://chromium.googlesource.com/chromium/src/+/71a0e1904e..51d47a5bb4/tools/clang/scripts/update.py TBR=chromium-webrtc-autoroll@webrtc-ci.iam.gserviceaccount.com, BUG=None Change-Id: Ie86e05ccd1d9f460e6d84ef7bfe938ebf931bfc0 Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/178342 Reviewed-by: Jeremy Leconte Reviewed-by: Autoroller Commit-Queue: Jeremy Leconte Cr-Commit-Position: refs/heads/master@{#31576} --- DEPS | 29 ++++++++++++++++++----------- build_overrides/build.gni | 4 ++++ 2 files changed, 22 insertions(+), 11 deletions(-) diff --git a/DEPS b/DEPS index 01e096285b..9abdde26a9 100644 --- a/DEPS +++ b/DEPS @@ -1,23 +1,30 @@ # This file contains dependencies for WebRTC. gclient_gn_args_file = 'src/build/config/gclient_args.gni' -gclient_gn_args = [] +gclient_gn_args = [ + 'mac_xcode_version', +] vars = { # By default, we should check out everything needed to run on the main # chromium waterfalls. More info at: crbug.com/570091. 'checkout_configuration': 'default', 'checkout_instrumented_libraries': 'checkout_linux and checkout_configuration == "default"', - 'chromium_revision': '71a0e1904e88451c64d46ae08e3f8cbdf4d5516e', + 'chromium_revision': '51d47a5bb4f63243bf13564d82ffeecee0a61b98', + + # This can be overridden, e.g. with custom_vars, to download a nonstandard + # Xcode version in build/mac_toolchain.py + # instead of downloading the prebuilt pinned revision. + 'mac_xcode_version': 'default', } deps = { # TODO(kjellander): Move this to be Android-only once the libevent dependency # in base/third_party/libevent is solved. 'src/base': - 'https://chromium.googlesource.com/chromium/src/base@736d9fb42c2399551cfe23f025f5e99530aea1a1', + 'https://chromium.googlesource.com/chromium/src/base@057fa3c509ed40122d5a2c863fcee67fd5d3112c', 'src/build': - 'https://chromium.googlesource.com/chromium/src/build@ceecd92e25abdf9d8f83e9d41252e3970cb02169', + 'https://chromium.googlesource.com/chromium/src/build@d83f4a5f00363b8d99d1080780a3013d28f99fac', 'src/buildtools': 'https://chromium.googlesource.com/chromium/src/buildtools@1ed99573d57d4b6041261b531cdf876e631cf0bc', # Gradle 4.3-rc4. Used for testing Android Studio project generation for WebRTC. @@ -26,13 +33,13 @@ deps = { 'condition': 'checkout_android', }, 'src/ios': { - 'url': 'https://chromium.googlesource.com/chromium/src/ios@73c8bcb1b1964a20e95315440549f0ab62da4fd5', + 'url': 'https://chromium.googlesource.com/chromium/src/ios@3e0172132582206ac4fda0de07266ded4fcdb0a9', 'condition': 'checkout_ios', }, 'src/testing': - 'https://chromium.googlesource.com/chromium/src/testing@77ba7104d5d19121181a4409f78ec1825f33828f', + 'https://chromium.googlesource.com/chromium/src/testing@6cdbe3084b4739ea64fed8122750d8188cdb784e', 'src/third_party': - 'https://chromium.googlesource.com/chromium/src/third_party@1908162da77ee31984c59c91e502b11fe34ec55d', + 'https://chromium.googlesource.com/chromium/src/third_party@9f9e479209dcefcd8b2321d1f74a2d063480ba0c', 'src/buildtools/linux64': { 'packages': [ @@ -123,14 +130,14 @@ deps = { 'src/third_party/breakpad/breakpad': 'https://chromium.googlesource.com/breakpad/breakpad.git@2757a2c9c819fcae3784576aef0c8400c7ad06d7', 'src/third_party/catapult': - 'https://chromium.googlesource.com/catapult.git@e0658a4adf1247bd20ab047b7dc95fa9b9efb96b', + 'https://chromium.googlesource.com/catapult.git@a2a7e05eb765667ff785726b3ecd78d48f49dc88', 'src/third_party/ced/src': { 'url': 'https://chromium.googlesource.com/external/github.com/google/compact_enc_det.git@ba412eaaacd3186085babcd901679a48863c7dd5', }, 'src/third_party/colorama/src': 'https://chromium.googlesource.com/external/colorama.git@799604a1041e9b3bc5d2789ecbd7e8db2e18e6b8', 'src/third_party/depot_tools': - 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@87c8b91639837bc8518cdbe4842484633cf60b6e', + 'https://chromium.googlesource.com/chromium/tools/depot_tools.git@6e6c67d0eac4eaca84e81c1d6c10ba615c99872b', 'src/third_party/ffmpeg': 'https://chromium.googlesource.com/chromium/third_party/ffmpeg.git@23b2a15c2595925c8ec0d3be9a51ec3257281bd1', 'src/third_party/findbugs': { @@ -201,7 +208,7 @@ deps = { 'condition': 'checkout_android', }, 'src/third_party/perfetto': - 'https://android.googlesource.com/platform/external/perfetto.git@44e38c4643cebae45fe9c4d32fd8a2b4dd708262', + 'https://android.googlesource.com/platform/external/perfetto.git@3e2475b08d8c485b6773427dc936986536c86026', 'src/third_party/libvpx/source/libvpx': 'https://chromium.googlesource.com/webm/libvpx.git@769129fb29fc66720be2b01276a472c334757d2d', 'src/third_party/libyuv': @@ -258,7 +265,7 @@ deps = { 'condition': 'checkout_win', }, 'src/tools': - 'https://chromium.googlesource.com/chromium/src/tools@d6998993f922de013a4f299d53afda745d13319e', + 'https://chromium.googlesource.com/chromium/src/tools@15b01f76a1a729c4a3dff953ae011c22452565c8', 'src/tools/swarming_client': 'https://chromium.googlesource.com/infra/luci/client-py.git@4c095d04179dc725a300085ae21fe3b79900d072', diff --git a/build_overrides/build.gni b/build_overrides/build.gni index 32d04d065b..ff4c538498 100644 --- a/build_overrides/build.gni +++ b/build_overrides/build.gni @@ -52,4 +52,8 @@ declare_args() { # purposes. In any case, it doesn't depend on //third_party/perfetto which # is used for base tracing, so this feature is disabled. enable_base_tracing = false + + # If true, it assumes that //third_party/abseil-cpp is an available + # dependency for googletest. + gtest_enable_absl_printers = true }