Move Google Benchmark to match Chromium

Issue: 326748668 Reviewed-on: #3218
youtube · May 16, 2024 · dc9bd39 · dc9bd39
2 parents 7d9af29 + ed7bc6b
commit dc9bd39
Show file tree

Hide file tree

Showing 142 changed files with 452 additions and 404 deletions.
diff --git a/starboard/benchmark/memory_benchmark.cc b/starboard/benchmark/memory_benchmark.cc
@@ -16,7 +16,7 @@
 
 #include "starboard/memory.h"
 
-#include "third_party/google_benchmark/include/benchmark/benchmark.h"
+#include "third_party/google_benchmark/src/include/benchmark/benchmark.h"
 
 namespace starboard {
 namespace benchmark {

diff --git a/starboard/benchmark/thread_benchmark.cc b/starboard/benchmark/thread_benchmark.cc
@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-#include "third_party/google_benchmark/include/benchmark/benchmark.h"
+#include "third_party/google_benchmark/src/include/benchmark/benchmark.h"
 
 namespace starboard {
 namespace benchmark {

diff --git a/starboard/common/benchmark_main.cc b/starboard/common/benchmark_main.cc
@@ -15,7 +15,7 @@
 #include "starboard/client_porting/wrap_main/wrap_main.h"
 #include "starboard/event.h"
 #include "starboard/system.h"
-#include "third_party/google_benchmark/include/benchmark/benchmark.h"
+#include "third_party/google_benchmark/src/include/benchmark/benchmark.h"
 
 namespace {
 int RunAllBenchmarks(int argc, char** argv) {

diff --git a/starboard/shared/starboard/player/filter/testing/audio_decoder_benchmark.cc b/starboard/shared/starboard/player/filter/testing/audio_decoder_benchmark.cc
@@ -24,7 +24,7 @@
 #include "starboard/shared/starboard/player/input_buffer_internal.h"
 #include "starboard/shared/starboard/player/job_queue.h"
 #include "starboard/shared/starboard/player/video_dmp_reader.h"
-#include "third_party/google_benchmark/include/benchmark/benchmark.h"
+#include "third_party/google_benchmark/src/include/benchmark/benchmark.h"
 
 namespace starboard {
 namespace shared {

diff --git a/third_party/google_benchmark/BUILD.gn b/third_party/google_benchmark/BUILD.gn
@@ -16,27 +16,27 @@ static_library("google_benchmark") {
   testonly = true
 
   sources = [
-    "src/benchmark.cc",
-    "src/benchmark_api_internal.cc",
-    "src/benchmark_name.cc",
-    "src/benchmark_register.cc",
-    "src/benchmark_runner.cc",
-    "src/colorprint_starboard.cc",
-    "src/commandlineflags.cc",
-    "src/complexity.cc",
-    "src/console_reporter.cc",
-    "src/counter.cc",
-    "src/csv_reporter.cc",
-    "src/json_reporter.cc",
-    "src/reporter.cc",
-    "src/sleep.cc",
-    "src/statistics.cc",
-    "src/string_util.cc",
-    "src/sysinfo.cc",
-    "src/timers.cc",
+    "src/src/benchmark.cc",
+    "src/src/benchmark_api_internal.cc",
+    "src/src/benchmark_name.cc",
+    "src/src/benchmark_register.cc",
+    "src/src/benchmark_runner.cc",
+    "src/src/colorprint_starboard.cc",
+    "src/src/commandlineflags.cc",
+    "src/src/complexity.cc",
+    "src/src/console_reporter.cc",
+    "src/src/counter.cc",
+    "src/src/csv_reporter.cc",
+    "src/src/json_reporter.cc",
+    "src/src/reporter.cc",
+    "src/src/sleep.cc",
+    "src/src/statistics.cc",
+    "src/src/string_util.cc",
+    "src/src/sysinfo.cc",
+    "src/src/timers.cc",
   ]
 
-  include_dirs = [ "include" ]
+  include_dirs = [ "src/include" ]
 
   public_deps = [ "//starboard/common" ]
 }
diff --git a/third_party/google_benchmark/CMakeLists.txt b/third_party/google_benchmark/CMakeLists.txt
diff --git a/third_party/google_benchmark/METADATA b/third_party/google_benchmark/METADATA
@@ -1,24 +1,15 @@
-name: "google_benchmark"
-description:
-  "Benchmark is a Google library that benchmarks code snippets, similar to "
-  "unit tests. Cobalt currently enables Benchmark on Linux and Android to "
-  "benchmark memory and thread usage."
-
 third_party {
   identifier {
     type: "ChromiumVersion"
     value: "87.0.4280.142"  # from https://chromereleases.googleblog.com/2021/01/stable-channel-update-for-chrome-os.html
   }
   identifier {
     type: "Git"
-    value: "https://chromium.googlesource.com/external/github.com/google/benchmark.git"
-    version: "367119482ff4abc3d73e4a109b410090fc281337"
-    # from https://chromium.googlesource.com/chromium/src/+/87.0.4280.142/DEPS#821
+    value: "https://chromium.googlesource.com/chromium/src.git"
+    version: "f73da6d3eaeb33e9d4bcb497bf13c655143a82f9"
   }
-  last_upgrade_date {
-    year: 2019
-    month: 12
-    day: 2
+  identifier {
+    type: "UpstreamSubdir"
+    value: "third_party/google_benchmark"
   }
-  license_type: NOTICE
 }
diff --git a/third_party/google_benchmark/OWNERS b/third_party/google_benchmark/OWNERS
@@ -0,0 +1,8 @@
+# Primary for bugs, reviews:
+pwnall@chromium.org
+
+# Secondary:
+jsbell@chromium.org
+
+# TEAM: storage-dev@chromium.org
+# COMPONENT: Internals>Storage