Update google_benchmark to efc89f0b
https://chromium.googlesource.com/external/github.com/google/benchmark.git/+log/f730846b0a3c..efc89f0b524
Also formalizes that Storage no longer owns this since it's more broadly
used.
Bug: v8:13819
Change-Id: Ib1f3ab535467df7150dbbdbc389d49e3a6f01bde
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4336481
Commit-Queue: Peter Kasting <pkasting@chromium.org>
Reviewed-by: Austin Sullivan <asully@chromium.org>
Auto-Submit: Alexander Schulze <alexschulze@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1117806}
NOKEYCHECK=True
GitOrigin-RevId: 132700b140dd11a126e681c78dea2839df67cf45
diff --git a/BUILD.gn b/BUILD.gn
index 09e0be4..c2ff928 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -4,6 +4,10 @@
config("benchmark_config") {
include_dirs = [ "src/include" ]
+
+ if (!is_component_build) {
+ defines = [ "BENCHMARK_STATIC_DEFINE" ]
+ }
}
# TODO(crbug.com/1344570): Remove once third_party/google_benchmark no longer
@@ -12,10 +16,13 @@
cflags = [ "-Wno-deprecated-declarations" ]
}
-source_set("google_benchmark") {
+component("google_benchmark") {
testonly = true
- public = [ "src/include/benchmark/benchmark.h" ]
+ public = [
+ "src/include/benchmark/benchmark.h",
+ "src/include/benchmark/export.h",
+ ]
sources = [
"src/src/arraysize.h",
@@ -27,6 +34,7 @@
"src/src/benchmark_register.h",
"src/src/benchmark_runner.cc",
"src/src/benchmark_runner.h",
+ "src/src/check.cc",
"src/src/check.h",
"src/src/colorprint.cc",
"src/src/colorprint.h",
@@ -47,8 +55,6 @@
"src/src/perf_counters.h",
"src/src/re.h",
"src/src/reporter.cc",
- "src/src/sleep.cc",
- "src/src/sleep.h",
"src/src/statistics.cc",
"src/src/statistics.h",
"src/src/string_util.cc",
@@ -68,7 +74,13 @@
":benchmark_suppress_warnings",
]
+ if (is_win) {
+ configs -= [ "//build/config/win:nominmax" ]
+ }
+
defines = [
+ "benchmark_EXPORTS=1",
+
# Tell gtest to always use standard regular expressions.
"HAVE_GNU_POSIX_REGEX=0",
"HAVE_POSIX_REGEX=0",
@@ -76,8 +88,9 @@
]
}
-source_set("benchmark_main") {
+component("benchmark_main") {
testonly = true
sources = [ "src/src/benchmark_main.cc" ]
+ defines = [ "benchmark_EXPORTS=1" ]
deps = [ ":google_benchmark" ]
}
diff --git a/DIR_METADATA b/DIR_METADATA
index d247f03..643d2ba 100644
--- a/DIR_METADATA
+++ b/DIR_METADATA
@@ -1,4 +1,3 @@
monorail: {
- component: "Internals>Storage"
+ component: "Internals>Core"
}
-team_email: "storage-dev@chromium.org"
diff --git a/OWNERS b/OWNERS
index 1cd1c1d..0dc4bec 100644
--- a/OWNERS
+++ b/OWNERS
@@ -1,5 +1,6 @@
# Primary for bugs, reviews:
asully@chromium.org
+pkasting@chromium.org
# Secondary:
ayui@chromium.org
diff --git a/README.chromium b/README.chromium
index e0a77c9..34ce0eb 100644
--- a/README.chromium
+++ b/README.chromium
@@ -1,7 +1,7 @@
Name: Google Benchmark
Short Name: benchmark
URL: https://github.com/google/benchmark
-Version: unknown
+Version: efc89f0b524780b1994d5dddd83a92718e5be492
License: Apache 2.0
License File: NOT_SHIPPED
Security Critical: no