commit 8a4ef48fa571820b539f4bbf3346f47ff7e8008e
author Aaron Wood <aaronwood@google.com> Thu Apr 18 11:14:25 2024 -0700
committer CQ Bot <fuchsia-internal-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Apr 19 00:28:35 2024 +0000
tree ff785707d115facb9f3dee124cc0860463202279
parent 01a488afa0c102102c40102660ee7a38dfa7ed59

[build][assembly] Restrict visiblity of sbase binaries and remove unused targets

Now that the sbase tools are added via assembly, remove unnecessary
targets and restrict the visibility of all targets down to those that
need to add the sbase tools to specific packages.

Bug: b/332905857
Change-Id: I1d6f484cdaf33fc5bc4dc603c8f4ce0c802d233b
Reviewed-on: https://fuchsia-review.googlesource.com/c/third_party/sbase/+/1031099
Reviewed-by: John Wittrock <wittrock@google.com>
Fuchsia-Auto-Submit: Aaron Wood <aaronwood@google.com>
Commit-Queue: Aaron Wood <aaronwood@google.com>

BUILD.gn

diff --git a/BUILD.gn b/BUILD.gn
index 7219df7..b83a2fc 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -6,8 +6,11 @@
 import("binaries.gni")
 
 group("bins") {
-  deps = []
+  # This group exists to provide shell command binaries for includes in the
+  # debug-dash-launcher package.
+  visibility = [ "//src/sys/tools/debug-dash-launcher:*" ]
 
+  deps = []
   foreach(bin, sbase_binaries) {
     deps += [ ":${bin}_bin" ]
   }
@@ -27,6 +30,16 @@
 
 foreach(bin, sbase_binaries) {
   executable("${bin}_bin") {
+    visibility = [ ":*" ]
+
+    if (bin == "cat") {
+      # the 'cat' binary is also used by these tests
+      visibility += [
+        "//src/connectivity/network/tests/socket:*",
+        "//src/lib/zxdump:*",
+      ]
+    }
+
     output_name = bin
 
     sources = [ "$bin.c" ]
@@ -42,14 +55,8 @@
   }
 
   fuchsia_package("${bin}_pkg") {
+    visibility = [ "//bundles/assembly:*" ]
     package_name = bin
     deps = [ ":${bin}_bin" ]
   }
 }
-
-group("sbase-pkgs") {
-  deps = []
-  foreach(bin, sbase_binaries) {
-    deps += [ ":${bin}_pkg" ]
-  }
-}