commit 049f5ef9b9bcc6b2dcf3fe353c2deb10a140e910
author Peter Kasting <pkasting@chromium.org> Tue Mar 14 16:56:25 2023
committer WebRTC LUCI CQ <webrtc-scoped@luci-project-accounts.iam.gserviceaccount.com> Tue Mar 14 20:28:26 2023
tree 3927c66f442f526eae8cce1909c0a2792de16ae4
parent 44853a2718794d3645c67fa3f74c7ceeb3a42e72

Always check out google_benchmark, part 4.

Remove use of non-WebRTC-specific arg to control benchmark use.

Bug: chromium:1404759
Change-Id: If50b215ff6c7698d385d1271bc8b6c38ed443e32
Reviewed-on: https://webrtc-review.googlesource.com/c/src/+/297680
Auto-Submit: Peter Kasting <pkasting@chromium.org>
Commit-Queue: Mirko Bonadei <mbonadei@webrtc.org>
Reviewed-by: Mirko Bonadei <mbonadei@webrtc.org>
Cr-Commit-Position: refs/heads/main@{#39556}

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 24fe451..d0e643e 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -628,7 +628,7 @@
     }
   }
 
-  if (enable_google_benchmarks && rtc_enable_google_benchmarks) {
+  if (rtc_enable_google_benchmarks) {
     rtc_test("benchmarks") {
       testonly = true
       deps = [

rtc_base/BUILD.gn

diff --git a/rtc_base/BUILD.gn b/rtc_base/BUILD.gn
index 4c860cd..49aa930 100644
--- a/rtc_base/BUILD.gn
+++ b/rtc_base/BUILD.gn
@@ -2041,7 +2041,7 @@
         "synchronization:mutex",
         "third_party/sigslot",
       ]
-      if (enable_google_benchmarks && rtc_enable_google_benchmarks) {
+      if (rtc_enable_google_benchmarks) {
         deps += [ "synchronization:synchronization_unittests" ]
       }
       if (is_win) {

rtc_base/synchronization/BUILD.gn

diff --git a/rtc_base/synchronization/BUILD.gn b/rtc_base/synchronization/BUILD.gn
index 5b2ff6e..ce69658 100644
--- a/rtc_base/synchronization/BUILD.gn
+++ b/rtc_base/synchronization/BUILD.gn
@@ -73,8 +73,7 @@
   ]
 }
 
-if (rtc_include_tests && enable_google_benchmarks &&
-    rtc_enable_google_benchmarks) {
+if (rtc_include_tests && rtc_enable_google_benchmarks) {
   rtc_library("synchronization_unittests") {
     testonly = true
     sources = [

test/BUILD.gn

diff --git a/test/BUILD.gn b/test/BUILD.gn
index 79595eb..a9b37bb 100644
--- a/test/BUILD.gn
+++ b/test/BUILD.gn
@@ -495,7 +495,7 @@
 }
 
 if (rtc_include_tests) {
-  if (enable_google_benchmarks && rtc_enable_google_benchmarks) {
+  if (rtc_enable_google_benchmarks) {
     rtc_library("benchmark_main") {
       testonly = true
       sources = [ "benchmark_main.cc" ]