From 9230a278e12d1aab96091626877cc2af610d3dc9 Mon Sep 17 00:00:00 2001 From: Michael Achenbach Date: Tue, 19 Jul 2022 18:19:11 +0200 Subject: [PATCH] Reland "Update V8 DEPS" This is a reland of commit c66a80172e67d20e3fd2af773f5c3a5171615476 The reland suppresses the deprecation warning on windows for google_benchmark. Original change's description: > Update V8 DEPS > > Rolling both trusted-versions and trusted-origins and an additional patch coming from https://crrev.com/c/3706887. > > Rolling v8/buildtools/third_party/libc++/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libcxx/+log/b126981..88bf407 > > Rolling v8/buildtools/third_party/libunwind/trunk: https://chromium.googlesource.com/external/github.com/llvm/llvm-project/libunwind/+log/49191c5..955e2ff > > Rolling v8/third_party/depot_tools: https://chromium.googlesource.com/chromium/tools/depot_tools/+log/8168f76..f05fcf7 > > Rolling v8/build: https://chromium.googlesource.com/chromium/src/build/+log/679de1e..6e435d6 > > Rolling v8/buildtools: https://chromium.googlesource.com/chromium/src/buildtools/+log/5cee6a2..a4506d5 > > > > R=v8-waterfall-sheriff@grotations.appspotmail.com,mtv-sf-v8-sheriff@grotations.appspotmail.com > > Bug: chromium:1345621 > Change-Id: I0659a5f98c83bbc6f061259e798a4b85a7cd7c63 > Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3766889 > Reviewed-by: Michael Achenbach > Commit-Queue: Liviu Rau > Cr-Commit-Position: refs/heads/main@{#81815} Bug: chromium:1345621 Change-Id: I2975ca6ae04c99a9e53f3bbd6872b7d114febb7c Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3773775 Commit-Queue: Michael Achenbach Reviewed-by: Leszek Swirski Cr-Commit-Position: refs/heads/main@{#81823} --- DEPS | 18 ++++++++++++++---- third_party/google_benchmark/BUILD.gn | 5 +++++ 2 files changed, 19 insertions(+), 4 deletions(-) diff --git a/DEPS b/DEPS index 2b9a40d291..e2538f7778 100644 --- a/DEPS +++ b/DEPS @@ -91,9 +91,9 @@ deps = { 'base/trace_event/common': Var('chromium_url') + '/chromium/src/base/trace_event/common.git' + '@' + 'd115b033c4e53666b535cbd1985ffe60badad082', 'build': - Var('chromium_url') + '/chromium/src/build.git' + '@' + '679de1ec39660023aa6abef1ec0d62893747d39f', + Var('chromium_url') + '/chromium/src/build.git' + '@' + '6e435d61582c939164df2e481a8cd4d718bc0a68', 'buildtools': - Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + '5cee6a2f1cc44900a8ce1e690902041788736358', + Var('chromium_url') + '/chromium/src/buildtools.git' + '@' + 'a4506d5d63a5a13a8c9ae8b29f67f7e3c3bc192b', 'buildtools/clang_format/script': Var('chromium_url') + '/external/github.com/llvm/llvm-project/clang/tools/clang-format.git' + '@' + '8b525d2747f2584fc35d8c7e612e66f377858df7', 'buildtools/linux64': { @@ -117,11 +117,11 @@ deps = { 'condition': 'host_os == "mac"', }, 'buildtools/third_party/libc++/trunk': - Var('chromium_url') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + 'b1269813eaf5b8ac78e35e45a0f7cc320bd3e7d6', + Var('chromium_url') + '/external/github.com/llvm/llvm-project/libcxx.git' + '@' + '88bf4070487fbe9020697a2281743b91e5e29bef', 'buildtools/third_party/libc++abi/trunk': Var('chromium_url') + '/external/github.com/llvm/llvm-project/libcxxabi.git' + '@' + 'b954e3e65634a9e2f7b595598a30c455f5f2eb26', 'buildtools/third_party/libunwind/trunk': - Var('chromium_url') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + '49191c55bba0e64664954eec93a43d8eb11e5798', + Var('chromium_url') + '/external/github.com/llvm/llvm-project/libunwind.git' + '@' + '955e2ff5fbb15791fea263c1c80e1ec6b3c5ee61', 'buildtools/win': { 'packages': [ { @@ -639,4 +639,14 @@ hooks = [ 'tools/generate-header-include-checks.py', ], }, + { + # Clean up build dirs for crbug.com/1337238. + # After a libc++ roll and revert, .ninja_deps would get into a state + # that breaks Ninja on Windows. + # TODO(crbug.com/1337238): Remove in a month or so. + 'name': 'del_ninja_deps_cache', + 'pattern': '.', + 'condition': 'host_os == "win"', + 'action': ['python3', 'build/del_ninja_deps_cache.py'], + }, ] diff --git a/third_party/google_benchmark/BUILD.gn b/third_party/google_benchmark/BUILD.gn index fc42dac851..123ea36bf8 100644 --- a/third_party/google_benchmark/BUILD.gn +++ b/third_party/google_benchmark/BUILD.gn @@ -11,6 +11,11 @@ if (v8_enable_google_benchmark) { "src/include", "precompiled_headers", ] + if (is_win) { + # TODO(https://crbug.com/1345621): Remove when google benchmark dropped the + # deprecated declarations. + cflags = ["-Wno-deprecated-declarations"] + } } source_set("google_benchmark") {