From f36c8dbfe093509c474ee71c5cb14bfa5adfc6ae Mon Sep 17 00:00:00 2001
From: Cecille Freeman <cecille@google.com>
Date: Wed, 27 Sep 2023 18:53:23 -0400
Subject: [PATCH] Why are these so intertwined

---
 src/credentials/BUILD.gn |  2 +-
 src/lib/support/BUILD.gn | 11 +----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/src/credentials/BUILD.gn b/src/credentials/BUILD.gn
index 2e1f9ed657649e..67732d4a9f18d5 100644
--- a/src/credentials/BUILD.gn
+++ b/src/credentials/BUILD.gn
@@ -132,7 +132,7 @@ source_set("test_paa_store") {
     "attestation_verifier/CHIPAttCert_test_paa_store.h",
   ]
 
-  public_deps = [ "${chip_root}/src/lib/support:span" ]
+  public_deps = [ "${chip_root}/src/lib/support" ]
 }
 
 static_library("default_attestation_verifier") {
diff --git a/src/lib/support/BUILD.gn b/src/lib/support/BUILD.gn
index 99aa58daab10a7..ed57cc3629b85b 100644
--- a/src/lib/support/BUILD.gn
+++ b/src/lib/support/BUILD.gn
@@ -79,16 +79,6 @@ source_set("chip_version_header") {
   deps = [ ":gen_chip_version" ]
 }
 
-source_set("span") {
-  sources = [ "Span.h" ]
-
-  public_deps = [ "${chip_root}/src/lib/core:chip_config_header" ]
-  deps = [ "${nlassert_root}:nlassert" ]
-  if (chip_pw_tokenizer_logging) {
-    deps += [ "${dir_pw_tokenizer}" ]
-  }
-}
-
 static_library("support") {
   output_name = "libSupportLayer"
 
@@ -141,6 +131,7 @@ static_library("support") {
     "SerializableIntegerSet.h",
     "SetupDiscriminator.h",
     "SortUtils.h",
+    "Span.h",
     "StateMachine.h",
     "StringBuilder.cpp",
     "StringBuilder.h",