Manually update google_benchmark
https://github.com/google/benchmark/pull/1256 has been upstreamed. Manually roll forward and immediately remove the build-time work around. Change-Id: I567dc0bdfda128656c874b6555dc6a89eeaa8100 Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3236991 Auto-Submit: Michael Lippautz <mlippautz@chromium.org> Reviewed-by: Nico Weber <thakis@chromium.org> Reviewed-by: Michael Achenbach <machenbach@chromium.org> Commit-Queue: Michael Lippautz <mlippautz@chromium.org> Cr-Commit-Position: refs/heads/main@{#77502}
This commit is contained in:
parent
2b14bd03dc
commit
4009aacbb0
2
DEPS
2
DEPS
@ -223,7 +223,7 @@ deps = {
|
|||||||
'condition': 'checkout_fuchsia',
|
'condition': 'checkout_fuchsia',
|
||||||
},
|
},
|
||||||
'third_party/google_benchmark/src': {
|
'third_party/google_benchmark/src': {
|
||||||
'url': Var('chromium_url') + '/external/github.com/google/benchmark.git' + '@' + '1e3ab7fa434d1b4aebdd22b760dbf99c498ae7cd',
|
'url': Var('chromium_url') + '/external/github.com/google/benchmark.git' + '@' + '80d70ddd943aea41f105cd337b3efcf62c94eea0',
|
||||||
},
|
},
|
||||||
'third_party/googletest/src':
|
'third_party/googletest/src':
|
||||||
Var('chromium_url') + '/external/github.com/google/googletest.git' + '@' + '16f637fbf4ffc3f7a01fa4eceb7906634565242f',
|
Var('chromium_url') + '/external/github.com/google/googletest.git' + '@' + '16f637fbf4ffc3f7a01fa4eceb7906634565242f',
|
||||||
|
4
third_party/google_benchmark/BUILD.gn
vendored
4
third_party/google_benchmark/BUILD.gn
vendored
@ -8,10 +8,6 @@ import("../../gni/v8.gni")
|
|||||||
if (v8_enable_google_benchmark) {
|
if (v8_enable_google_benchmark) {
|
||||||
config("benchmark_config") {
|
config("benchmark_config") {
|
||||||
include_dirs = [ "src/include" ]
|
include_dirs = [ "src/include" ]
|
||||||
|
|
||||||
# Temporarily allow deprecated declarations until fixes are upstreamed, see
|
|
||||||
# https://github.com/google/benchmark/pull/1256.
|
|
||||||
cflags = [ "-Wno-deprecated-declarations" ]
|
|
||||||
}
|
}
|
||||||
|
|
||||||
source_set("google_benchmark") {
|
source_set("google_benchmark") {
|
||||||
|
Loading…
Reference in New Issue
Block a user