Implicitly add :gtest and :gtest_main dependencies to cf_cc_test targets

Databean · Databean · commit 823a6cba41b7 · 2026-04-15T16:19:34.000-07:00
Every target includes these dependencies manually, changing it to be
implicit adds some convenience to defining new test targets and reduces
clutter.

Bug: b/503084517
diff --git a/base/cvd/cuttlefish/bazel/rules.bzl b/base/cvd/cuttlefish/bazel/rules.bzl
@@ -70,12 +70,16 @@ cf_cc_library = macro(
     implementation = _cf_cc_library_implementation,
 )
 
-def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, **kwargs):
+def _cf_cc_test_implementation(name, clang_tidy_enabled, copts, deps, **kwargs):
     if not clang_tidy_enabled and not kwargs["deprecation"]:
         kwargs["deprecation"] = "Not covered by clang-tidy"
     cc_test(
         name = name,
         copts = (copts or []) + COPTS,
+        deps = deps + [
+            "@googletest//:gtest",
+            "@googletest//:gtest_main",
+        ],
         **kwargs,
     )
     if clang_tidy_enabled:
@@ -91,6 +95,7 @@ cf_cc_test = macro(
     attrs = {
         "clang_tidy_enabled": attr.bool(configurable = False, default = True, doc = "Decide if a corresponding clang_tidy_test target is generated"),
         "copts": attr.string_list(configurable = False, default = []),
+        "deps": attr.label_list(configurable = False),
     },
     implementation = _cf_cc_test_implementation,
 )
diff --git a/base/cvd/cuttlefish/common/libs/fs/BUILD.bazel b/base/cvd/cuttlefish/common/libs/fs/BUILD.bazel
@@ -51,8 +51,6 @@ cf_cc_test(
     deps = [
         ":fs",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/common/libs/key_equals_value/BUILD.bazel b/base/cvd/cuttlefish/common/libs/key_equals_value/BUILD.bazel
@@ -23,7 +23,5 @@ cf_cc_test(
         "//cuttlefish/common/libs/key_equals_value",
         "//cuttlefish/result",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
diff --git a/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel b/base/cvd/cuttlefish/common/libs/utils/BUILD.bazel
@@ -36,8 +36,6 @@ cf_cc_test(
         "//cuttlefish/common/libs/utils:base64",
         "//cuttlefish/result:result_matchers",
         "//cuttlefish/result:result_type",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -142,8 +140,6 @@ cf_cc_test(
         "//cuttlefish/result",
         "//cuttlefish/result:result_matchers",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -175,8 +171,6 @@ cf_cc_test(
         "//cuttlefish/result",
         "//cuttlefish/result:result_matchers",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
         "@libxml2",
     ],
 )
@@ -251,11 +245,7 @@ cf_cc_library(
 cf_cc_test(
     name = "network_test",
     srcs = ["network_test.cpp"],
-    deps = [
-        ":network",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+    deps = [":network"],
 )
 
 cf_cc_library(
@@ -280,8 +270,6 @@ cf_cc_test(
         "//cuttlefish/common/libs/utils:contains",
         "//cuttlefish/common/libs/utils:proc_file_utils",
         "//cuttlefish/result",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -437,8 +425,6 @@ cf_cc_test(
         "//cuttlefish/result",
         "//libbase",
         "@abseil-cpp//absl/log:check",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/BUILD.bazel
@@ -459,8 +459,6 @@ cf_cc_test(
         "//cuttlefish/io",
         "//cuttlefish/io:in_memory",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/android_build/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/android_build/BUILD.bazel
@@ -93,8 +93,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/assemble_cvd/android_build:fake_android_build",
         "//cuttlefish/result",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/BUILD.bazel b/base/cvd/cuttlefish/host/commands/assemble_cvd/boot_image/BUILD.bazel
@@ -47,8 +47,6 @@ cf_cc_test(
         "//cuttlefish/io:read_window_view",
         "//cuttlefish/io:string",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -93,7 +91,5 @@ cf_cc_test(
         "//cuttlefish/io:read_window_view",
         "//cuttlefish/io:string",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/BUILD.bazel
@@ -35,8 +35,6 @@ cf_cc_test(
     deps = [
         "//cuttlefish/host/commands/cvd/cli:frontline_parser",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/BUILD.bazel
@@ -68,8 +68,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/cvd/cli/parser:cf_configs_common",
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -93,8 +91,6 @@ cf_cc_test(
     deps = [
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -180,8 +176,6 @@ cf_cc_test(
         "//cuttlefish/result",
         "//cuttlefish/result:result_matchers",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
         "@jsoncpp",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/parser/instance/BUILD.bazel
@@ -9,8 +9,6 @@ cf_cc_test(
     srcs = ["boot_configs_test.cc"],
     deps = [
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
         "@jsoncpp",
     ],
 )
@@ -107,8 +105,6 @@ cf_cc_test(
     srcs = ["disk_configs_test.cc"],
     deps = [
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
         "@jsoncpp",
     ],
 )
@@ -123,8 +119,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/assemble_cvd:launch_cvd_cc_proto",
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
         "@jsoncpp",
         "@protobuf",
         "@protobuf//:differencer",
@@ -139,8 +133,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/cvd/cli/parser:test_common",
         "//cuttlefish/result:result_matchers",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
         "@jsoncpp",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/cvd/cli/selector/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/cli/selector/BUILD.bazel
@@ -43,8 +43,6 @@ cf_cc_test(
         "//cuttlefish/common/libs/utils:environment",
         "//cuttlefish/host/commands/cvd/cli/commands:host_tool_target",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -69,8 +67,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/cvd/cli/selector:parser_ids_helper",
         "//cuttlefish/host/commands/cvd/cli/selector:start_selector_parser",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -95,8 +91,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/cvd/cli/selector:selector_common_parser",
         "//cuttlefish/host/commands/cvd/cli/selector:start_selector_parser",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/fetch/BUILD.bazel
@@ -133,8 +133,6 @@ cf_cc_test(
         "//cuttlefish/result:result_matchers",
         "//libbase",
         "@fmt",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -239,8 +237,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/cvd/fetch:fetch_cvd_parser",
         "//cuttlefish/result",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd/instances/BUILD.bazel
@@ -75,8 +75,6 @@ cf_cc_test(
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:instance_database_helper",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
@@ -145,19 +143,13 @@ cf_cc_test(
         "//cuttlefish/host/commands/cvd/instances",
         "//cuttlefish/host/commands/cvd/instances:cvd_persistent_data",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
 cf_cc_test(
     name = "local_instance_test",
     srcs = ["local_instance_test.cpp"],
-    deps = [
-        "//cuttlefish/host/commands/cvd/instances",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+    deps = ["//cuttlefish/host/commands/cvd/instances"],
 )
 
 cf_cc_library(
diff --git a/base/cvd/cuttlefish/host/commands/cvd_import_locations/unittest/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd_import_locations/unittest/BUILD.bazel
@@ -14,7 +14,5 @@ cf_cc_test(
         "//cuttlefish/host/libs/location",
         "//cuttlefish/host/libs/location:string_parse",
         "//libbase",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/cvd_send_id_disclosure/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd_send_id_disclosure/BUILD.bazel
@@ -38,9 +38,5 @@ cf_cc_test(
     srcs = [
         "unittest/cellular_identifier_disclosure_command_builder_test.cc",
     ],
-    deps = [
-        ":libcvd_id_disclosure_builder",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+    deps = [":libcvd_id_disclosure_builder"],
 )
diff --git a/base/cvd/cuttlefish/host/commands/cvd_send_sms/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd_send_sms/BUILD.bazel
@@ -49,7 +49,5 @@ cf_cc_test(
         "//cuttlefish/common/libs/fs",
         "//libbase",
         "@abseil-cpp//absl/log:check",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/commands/cvd_update_security_algorithm/BUILD.bazel b/base/cvd/cuttlefish/host/commands/cvd_update_security_algorithm/BUILD.bazel
@@ -38,9 +38,5 @@ cf_cc_test(
     srcs = [
         "unittest/update_security_algorithm_command_builder_test.cc",
     ],
-    deps = [
-        ":libcvd_update_security_algorithm_builder",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+    deps = [":libcvd_update_security_algorithm_builder"],
 )
diff --git a/base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel b/base/cvd/cuttlefish/host/commands/metrics/BUILD.bazel
@@ -170,9 +170,5 @@ cf_cc_library(
 cf_cc_test(
     name = "utils_test",
     srcs = ["utils_tests.cpp"],
-    deps = [
-        "//cuttlefish/host/commands/metrics:utils",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+    deps = ["//cuttlefish/host/commands/metrics:utils"],
 )
diff --git a/base/cvd/cuttlefish/host/commands/modem_simulator/BUILD.bazel b/base/cvd/cuttlefish/host/commands/modem_simulator/BUILD.bazel
@@ -44,11 +44,7 @@ cf_cc_library(
 cf_cc_test(
     name = "command_parser_test",
     srcs = ["unittest/command_parser_test.cpp"],
-    deps = [
-        "//cuttlefish/host/commands/modem_simulator:command_parser",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+    deps = ["//cuttlefish/host/commands/modem_simulator:command_parser"],
 )
 
 cf_cc_library(
@@ -213,11 +209,7 @@ cf_cc_library(
 cf_cc_test(
     name = "pdu_parser_test",
     srcs = ["unittest/pdu_parser_test.cpp"],
-    deps = [
-        "//cuttlefish/host/commands/modem_simulator:pdu_parser",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
-    ],
+    deps = ["//cuttlefish/host/commands/modem_simulator:pdu_parser"],
 )
 
 cf_cc_test(
@@ -239,8 +231,6 @@ cf_cc_test(
         "@abseil-cpp//absl/log",
         "@abseil-cpp//absl/strings",
         "@gflags",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/libs/config/adb/BUILD.bazel b/base/cvd/cuttlefish/host/libs/config/adb/BUILD.bazel
@@ -46,7 +46,5 @@ cf_cc_test(
         "//cuttlefish/host/libs/config:config_flag",
         "//cuttlefish/host/libs/feature",
         "@fruit",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
diff --git a/base/cvd/cuttlefish/host/libs/web/BUILD.bazel b/base/cvd/cuttlefish/host/libs/web/BUILD.bazel
@@ -77,8 +77,6 @@ cf_cc_test(
         "//cuttlefish/host/libs/web:android_build_string",
         "//cuttlefish/result",
         "//cuttlefish/result:result_matchers",
-        "@googletest//:gtest",
-        "@googletest//:gtest_main",
     ],
 )
 
diff --git a/base/cvd/cuttlefish/host/libs/web/cas/BUILD.bazel b/base/cvd/cuttlefish/host/libs/web/cas/BUILD.bazel
diff --git a/base/cvd/cuttlefish/host/libs/web/http_client/BUILD.bazel b/base/cvd/cuttlefish/host/libs/web/http_client/BUILD.bazel
diff --git a/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel b/base/cvd/cuttlefish/host/libs/zip/BUILD.bazel
diff --git a/base/cvd/cuttlefish/io/BUILD.bazel b/base/cvd/cuttlefish/io/BUILD.bazel
diff --git a/base/cvd/cuttlefish/pretty/BUILD.bazel b/base/cvd/cuttlefish/pretty/BUILD.bazel
diff --git a/base/cvd/cuttlefish/result/BUILD.bazel b/base/cvd/cuttlefish/result/BUILD.bazel

Original file line number	Diff line number	Diff line change
`@@ -51,8 +51,6 @@ cf_cc_test(`
`51`	`51`	`deps = [`
`52`	`52`	`":fs",`
`53`	`53`	`"//libbase",`
`54`		`- "@googletest//:gtest",`
`55`		`- "@googletest//:gtest_main",`
`56`	`54`	`],`
`57`	`55`	`)`
`58`	`56`
Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,5 @@ cf_cc_test(`
`23`	`23`	`"//cuttlefish/common/libs/key_equals_value",`
`24`	`24`	`"//cuttlefish/result",`
`25`	`25`	`"//cuttlefish/result:result_matchers",`
`26`		`- "@googletest//:gtest",`
`27`		`- "@googletest//:gtest_main",`
`28`	`26`	`],`
`29`	`27`	`)`
Original file line number	Diff line number	Diff line change
`@@ -459,8 +459,6 @@ cf_cc_test(`
`459`	`459`	`"//cuttlefish/io",`
`460`	`460`	`"//cuttlefish/io:in_memory",`
`461`	`461`	`"//cuttlefish/result:result_matchers",`
`462`		`- "@googletest//:gtest",`
`463`		`- "@googletest//:gtest_main",`
`464`	`462`	`],`
`465`	`463`	`)`
`466`	`464`
Original file line number	Diff line number	Diff line change
`@@ -93,8 +93,6 @@ cf_cc_test(`
`93`	`93`	`"//cuttlefish/host/commands/assemble_cvd/android_build:fake_android_build",`
`94`	`94`	`"//cuttlefish/result",`
`95`	`95`	`"//cuttlefish/result:result_matchers",`
`96`		`- "@googletest//:gtest",`
`97`		`- "@googletest//:gtest_main",`
`98`	`96`	`],`
`99`	`97`	`)`
`100`	`98`
Original file line number	Diff line number	Diff line change
`@@ -35,8 +35,6 @@ cf_cc_test(`
`35`	`35`	`deps = [`
`36`	`36`	`"//cuttlefish/host/commands/cvd/cli:frontline_parser",`
`37`	`37`	`"//cuttlefish/result:result_matchers",`
`38`		`- "@googletest//:gtest",`
`39`		`- "@googletest//:gtest_main",`
`40`	`38`	`],`
`41`	`39`	`)`
`42`	`40`