pw_span: Explicitly specify pw_span dependencies in GN

Bug: b/235237667 Change-Id: I856854de6d3a89510bce6912f6567c2ab86977ce Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/99620 Reviewed-by: Ted Pudlik <[email protected]> Pigweed-Auto-Submit: Wyatt Hepler <[email protected]> Commit-Queue: Auto-Submit <[email protected]>
google · Jun 24, 2022 · 1c974a1 · 1c974a1
1 parent 801d66a
commit 1c974a1
Show file tree

Hide file tree

Showing 46 changed files with 102 additions and 16 deletions.
diff --git a/pw_allocator/BUILD.gn b/pw_allocator/BUILD.gn
@@ -45,8 +45,9 @@ pw_source_set("block") {
   configs = [ ":enable_heap_poison" ]
   public = [ "public/pw_allocator/block.h" ]
   public_deps = [
-    "$dir_pw_assert",
-    "$dir_pw_status",
+    dir_pw_assert,
+    dir_pw_span,
+    dir_pw_status,
   ]
   sources = [ "block.cc" ]
 }
@@ -57,7 +58,8 @@ pw_source_set("freelist") {
   public = [ "public/pw_allocator/freelist.h" ]
   public_deps = [
     "$dir_pw_containers:vector",
-    "$dir_pw_status",
+    dir_pw_span,
+    dir_pw_status,
   ]
   sources = [ "freelist.cc" ]
 }
@@ -71,8 +73,9 @@ pw_source_set("freelist_heap") {
     ":freelist",
   ]
   deps = [
-    "$dir_pw_assert",
-    "$dir_pw_log",
+    dir_pw_assert,
+    dir_pw_log,
+    dir_pw_span,
   ]
   sources = [ "freelist_heap.cc" ]
 }

diff --git a/pw_assert/BUILD.gn b/pw_assert/BUILD.gn
@@ -205,6 +205,7 @@ pw_test("assert_facade_test") {
   ]
   deps = [
     ":pw_assert",
+    dir_pw_span,
     dir_pw_status,
     dir_pw_string,
   ]

diff --git a/pw_assert_tokenized/BUILD.gn b/pw_assert_tokenized/BUILD.gn
@@ -103,6 +103,7 @@ pw_source_set("log_handler") {
     "$dir_pw_bytes",
     "$dir_pw_log",
     "$dir_pw_log_tokenized",
+    "$dir_pw_span",
   ]
   sources = [ "log_handler.cc" ]
 }

diff --git a/pw_base64/BUILD.gn b/pw_base64/BUILD.gn
@@ -25,6 +25,7 @@ config("default_config") {
 pw_source_set("pw_base64") {
   public_configs = [ ":default_config" ]
   public = [ "public/pw_base64/base64.h" ]
+  public_deps = [ dir_pw_span ]
   sources = [ "base64.cc" ]
 }
 

diff --git a/pw_blob_store/BUILD.gn b/pw_blob_store/BUILD.gn
@@ -37,6 +37,7 @@ pw_source_set("pw_blob_store") {
     dir_pw_bytes,
     dir_pw_kvs,
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
   ]

diff --git a/pw_bluetooth/BUILD.gn b/pw_bluetooth/BUILD.gn
@@ -54,6 +54,7 @@ pw_source_set("pw_bluetooth") {
     "$dir_pw_chrono:system_clock",
     dir_pw_containers,
     dir_pw_function,
+    dir_pw_span,
     dir_pw_status,
   ]
 }

diff --git a/pw_bluetooth_hci/BUILD.gn b/pw_bluetooth_hci/BUILD.gn
@@ -39,6 +39,7 @@ pw_source_set("packet") {
     dir_pw_assert,
     dir_pw_bytes,
     dir_pw_result,
+    dir_pw_span,
   ]
   sources = [ "packet.cc" ]
   deps = [ dir_pw_status ]
@@ -53,6 +54,7 @@ pw_source_set("uart_transport") {
     "$dir_pw_bytes:bit",
     dir_pw_bytes,
     dir_pw_function,
+    dir_pw_span,
     dir_pw_status,
   ]
 }

diff --git a/pw_bytes/BUILD.gn b/pw_bytes/BUILD.gn
@@ -38,6 +38,7 @@ pw_source_set("pw_bytes") {
     "$dir_pw_bytes:bit",
     "$dir_pw_containers:iterator",
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_status,
   ]
 }

diff --git a/pw_checksum/BUILD.gn b/pw_checksum/BUILD.gn
@@ -32,7 +32,10 @@ pw_source_set("pw_checksum") {
     "crc16_ccitt.cc",
     "crc32.cc",
   ]
-  public_deps = [ dir_pw_bytes ]
+  public_deps = [
+    dir_pw_bytes,
+    dir_pw_span,
+  ]
 }
 
 pw_test_group("tests") {

diff --git a/pw_containers/BUILD.gn b/pw_containers/BUILD.gn
@@ -99,7 +99,7 @@ pw_test("algorithm_test") {
     ":algorithm",
     ":intrusive_list",
     ":vector",
-    "$dir_pw_polyfill:span",
+    dir_pw_span,
   ]
 }
 
@@ -108,6 +108,7 @@ pw_test("filtered_view_test") {
   deps = [
     ":filtered_view",
     ":intrusive_list",
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_cpu_exception/BUILD.gn b/pw_cpu_exception/BUILD.gn
@@ -100,7 +100,10 @@ pw_facade("handler") {
 pw_facade("support") {
   backend = pw_cpu_exception_SUPPORT_BACKEND
   public_configs = [ ":public_include_path" ]
-  public_deps = [ ":entry" ]
+  public_deps = [
+    ":entry",
+    dir_pw_span,
+  ]
   public = [ "public/pw_cpu_exception/support.h" ]
 }
 

diff --git a/pw_cpu_exception_cortex_m/BUILD.gn b/pw_cpu_exception_cortex_m/BUILD.gn
@@ -55,6 +55,7 @@ pw_source_set("support") {
     "$dir_pw_cpu_exception:support.facade",
     "$dir_pw_preprocessor:arch",
     dir_pw_log,
+    dir_pw_span,
     dir_pw_string,
   ]
   sources = [ "support.cc" ]
@@ -220,6 +221,7 @@ pw_test("cpu_exception_entry_test") {
     "$dir_pw_cpu_exception:entry",
     "$dir_pw_cpu_exception:handler",
     "$dir_pw_cpu_exception:support",
+    dir_pw_span,
   ]
   sources = [ "exception_entry_test.cc" ]
 }

diff --git a/pw_file/BUILD.gn b/pw_file/BUILD.gn
@@ -36,6 +36,7 @@ pw_source_set("flat_file_system") {
     dir_pw_bytes,
     dir_pw_log,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
   ]
   public_configs = [ ":public_includes" ]

diff --git a/pw_fuzzer/BUILD.gn b/pw_fuzzer/BUILD.gn
@@ -81,8 +81,9 @@ pw_doc_group("docs") {
 pw_fuzzer("toy_fuzzer") {
   sources = [ "examples/toy_fuzzer.cc" ]
   deps = [
-    "$dir_pw_result",
-    "$dir_pw_string",
+    dir_pw_result,
+    dir_pw_span,
+    dir_pw_string,
   ]
 }
 

diff --git a/pw_hdlc/BUILD.gn b/pw_hdlc/BUILD.gn
@@ -46,6 +46,7 @@ pw_source_set("decoder") {
     dir_pw_bytes,
     dir_pw_checksum,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
   ]
   deps = [ dir_pw_log ]
@@ -63,6 +64,7 @@ pw_source_set("encoder") {
     ":common",
     dir_pw_bytes,
     dir_pw_checksum,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
   ]
@@ -75,6 +77,7 @@ pw_source_set("rpc_channel_output") {
   public_deps = [
     ":pw_hdlc",
     "$dir_pw_rpc:server",
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_hex_dump/BUILD.gn b/pw_hex_dump/BUILD.gn
@@ -26,6 +26,7 @@ pw_source_set("pw_hex_dump") {
   public_configs = [ ":default_config" ]
   public_deps = [
     dir_pw_bytes,
+    dir_pw_span,
     dir_pw_status,
   ]
   deps = [ dir_pw_string ]

diff --git a/pw_i2c/BUILD.gn b/pw_i2c/BUILD.gn
@@ -50,6 +50,7 @@ pw_source_set("device") {
     "$dir_pw_bytes",
     "$dir_pw_chrono:system_clock",
     "$dir_pw_status",
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_kvs/BUILD.gn b/pw_kvs/BUILD.gn
@@ -65,6 +65,7 @@ pw_source_set("pw_kvs") {
     dir_pw_assert,
     dir_pw_bytes,
     dir_pw_containers,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
   ]
@@ -87,6 +88,7 @@ pw_source_set("crc16") {
   public_deps = [
     ":pw_kvs",
     dir_pw_checksum,
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_log/BUILD.gn b/pw_log/BUILD.gn
@@ -85,6 +85,7 @@ pw_source_set("proto_utils") {
     "$dir_pw_log:protos.pwpb",
     "$dir_pw_log_tokenized:metadata",
     "$dir_pw_result",
+    dir_pw_span,
   ]
   deps = [ "$dir_pw_protobuf" ]
   sources = [ "proto_utils.cc" ]

diff --git a/pw_log_rpc/BUILD.gn b/pw_log_rpc/BUILD.gn
@@ -88,6 +88,7 @@ pw_source_set("log_filter") {
     "$dir_pw_log:protos.pwpb",
     "$dir_pw_protobuf",
     "$dir_pw_status",
+    dir_pw_span,
   ]
 }
 
@@ -112,6 +113,7 @@ pw_source_set("rpc_log_drain") {
     "$dir_pw_status",
     "$dir_pw_sync:lock_annotations",
     "$dir_pw_sync:mutex",
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_log_tokenized/BUILD.gn b/pw_log_tokenized/BUILD.gn
@@ -91,6 +91,7 @@ pw_source_set("base64_over_hdlc") {
     "$dir_pw_stream:sys_io_stream",
     "$dir_pw_tokenizer:base64",
     "$dir_pw_tokenizer:global_handler_with_payload.facade",
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_malloc_freelist/BUILD.gn b/pw_malloc_freelist/BUILD.gn
@@ -31,6 +31,7 @@ pw_source_set("pw_malloc_freelist") {
     "$dir_pw_allocator:freelist_heap",
     "$dir_pw_malloc:facade",
     "$dir_pw_preprocessor",
+    dir_pw_span,
   ]
   sources = [ "freelist_malloc.cc" ]
 }
@@ -44,6 +45,7 @@ pw_test("freelist_malloc_test") {
   deps = [
     "$dir_pw_allocator",
     "$dir_pw_malloc",
+    dir_pw_span,
   ]
   sources = [ "freelist_malloc_test.cc" ]
 }

diff --git a/pw_metric/BUILD.gn b/pw_metric/BUILD.gn
@@ -36,6 +36,7 @@ pw_source_set("pw_metric") {
     dir_pw_log,
     dir_pw_tokenizer,
   ]
+  deps = [ dir_pw_span ]
 }
 
 # This gives access to the "PW_METRIC_GLOBAL()" macros, for globally-registered
@@ -66,6 +67,7 @@ if (dir_pw_third_party_nanopb != "") {
     public_deps = [
       ":metric_service_proto.nanopb_rpc",
       ":pw_metric",
+      dir_pw_span,
     ]
     public = [ "public/pw_metric/metric_service_nanopb.h" ]
     deps = [

diff --git a/pw_minimal_cpp_stdlib/BUILD.gn b/pw_minimal_cpp_stdlib/BUILD.gn
@@ -67,6 +67,7 @@ pw_source_set("pw_minimal_cpp_stdlib") {
     "public/internal/type_traits.h",
     "public/internal/utility.h",
   ]
+  public_deps = [ dir_pw_polyfill ]
 }
 
 pw_test_group("tests") {

diff --git a/pw_persistent_ram/BUILD.gn b/pw_persistent_ram/BUILD.gn
@@ -36,6 +36,7 @@ pw_source_set("pw_persistent_ram") {
     dir_pw_bytes,
     dir_pw_checksum,
     dir_pw_preprocessor,
+    dir_pw_span,
     dir_pw_stream,
   ]
 }

diff --git a/pw_protobuf/BUILD.gn b/pw_protobuf/BUILD.gn
@@ -54,6 +54,7 @@ pw_source_set("pw_protobuf") {
     dir_pw_function,
     dir_pw_log,
     dir_pw_result,
+    dir_pw_span,
     dir_pw_status,
     dir_pw_stream,
     dir_pw_varint,

diff --git a/pw_random/BUILD.gn b/pw_random/BUILD.gn
@@ -30,6 +30,7 @@ pw_source_set("pw_random") {
   ]
   public_deps = [
     dir_pw_bytes,
+    dir_pw_span,
     dir_pw_status,
   ]
 }

diff --git a/pw_ring_buffer/BUILD.gn b/pw_ring_buffer/BUILD.gn
@@ -35,6 +35,7 @@ pw_source_set("pw_ring_buffer") {
   deps = [
     "$dir_pw_assert:pw_assert",
     "$dir_pw_varint",
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_router/BUILD.gn b/pw_router/BUILD.gn
@@ -30,6 +30,7 @@ pw_source_set("static_router") {
     ":egress",
     ":packet_parser",
     dir_pw_metric,
+    dir_pw_span,
   ]
   public = [ "public/pw_router/static_router.h" ]
   sources = [ "static_router.cc" ]
@@ -41,13 +42,17 @@ pw_source_set("egress") {
   public_deps = [
     ":packet_parser",
     dir_pw_bytes,
+    dir_pw_span,
   ]
 }
 
 pw_source_set("packet_parser") {
   public_configs = [ ":public_include_path" ]
   public = [ "public/pw_router/packet_parser.h" ]
-  public_deps = [ dir_pw_bytes ]
+  public_deps = [
+    dir_pw_bytes,
+    dir_pw_span,
+  ]
 }
 
 pw_source_set("egress_function") {
@@ -56,6 +61,7 @@ pw_source_set("egress_function") {
   public_deps = [
     ":egress",
     dir_pw_function,
+    dir_pw_span,
   ]
 }
 

diff --git a/pw_rpc/BUILD.gn b/pw_rpc/BUILD.gn
@@ -101,6 +101,7 @@ pw_source_set("client") {
   public_deps = [
     ":common",
     dir_pw_result,
+    dir_pw_span,
   ]
   deps = [
     ":log_config",
@@ -153,6 +154,7 @@ pw_source_set("common") {
     dir_pw_assert,
     dir_pw_bytes,
     dir_pw_function,
+    dir_pw_span,
     dir_pw_status,
   ]