commit fe3b300897488d8c323cce64650fe26cda3caaf7
author Anthony DiGirolamo <tonymd@google.com> Thu May 16 22:04:07 2024 +0000
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Thu May 16 22:04:07 2024 +0000
tree 18de5361a5d37b98ab70d01cb050ed6e00d6095b
parent dcbe39839b38dd25381e14e61ef93cde1fdb0f82

pw_build: pw_cc_test.lib fixup

The bazel pw_cc_test rule was not removing the default test_main from
the .lib subtarget. This prevents users from overriding due to
multiple main functions being linked in.

Also add a missing dep to //third_party/boringssl:build_test

Bug: 307825072, 341109859
Change-Id: Iffdcb1171349fe775a54a5e3e1b62624fc8377f8
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/210231
Lint: Lint 🤖 <android-build-ayeaye@system.gserviceaccount.com>
Reviewed-by: Ted Pudlik <tpudlik@google.com>
Commit-Queue: Anthony DiGirolamo <tonymd@google.com>

pw_build/pigweed.bzl

diff --git a/pw_build/pigweed.bzl b/pw_build/pigweed.bzl
index bbf4ff1..7dd850e 100644
--- a/pw_build/pigweed.bzl
+++ b/pw_build/pigweed.bzl
@@ -108,15 +108,21 @@
     Args:
       **kwargs: Passed to cc_test.
     """
-    test_main = kwargs.get("test_main", "@pigweed//pw_unit_test:main")
-    kwargs.pop("test_main", "")
-
-    kwargs["deps"] = kwargs.get("deps", []) + [test_main]
 
     # TODO: b/234877642 - Remove this implicit dependency once we have a better
     # way to handle the facades without introducing a circular dependency into
     # the build.
-    kwargs["deps"] = kwargs["deps"] + ["@pigweed//pw_build:default_link_extra_lib"]
+    kwargs["deps"] = kwargs.get("deps", []) + ["@pigweed//pw_build:default_link_extra_lib"]
+
+    # Depend on the backend. E.g. to pull in gtest.h include paths.
+    kwargs["deps"] = kwargs["deps"] + ["@pigweed//pw_unit_test:backend"]
+
+    # Save the base set of deps minus pw_unit_test:main for the .lib target.
+    original_deps = kwargs["deps"]
+
+    # Add the unit test main label flag dep.
+    test_main = kwargs.pop("test_main", "@pigweed//pw_unit_test:main")
+    kwargs["deps"] = original_deps + [test_main]
 
     native.cc_test(**kwargs)
 
@@ -140,6 +146,9 @@
         "timeout",
     ):
         kwargs.pop(arg, "")
+
+    # Reset the deps for the .lib target.
+    kwargs["deps"] = original_deps
     native.cc_library(name = kwargs.pop("name") + ".lib", **kwargs)
 
 def pw_cc_perf_test(**kwargs):

third_party/boringssl/BUILD.bazel

diff --git a/third_party/boringssl/BUILD.bazel b/third_party/boringssl/BUILD.bazel
index ae38e3b..d8abd79 100644
--- a/third_party/boringssl/BUILD.bazel
+++ b/third_party/boringssl/BUILD.bazel
@@ -36,5 +36,6 @@
     ],
     deps = [
         ":sysdeps",
+        "//pw_bytes",
     ],
 )