Add files from src/lib/dnssd to be tracked by BUILD.gn files (#31976)

* Make sure dnssd constants and browsedelegate is tracked by gn * Add more minmdns sources to be known to gn * Move more things into Types to make sure that platform Dnssd knows about them * Fix system layer dependency in linux dnssd impl * Remove dnssd files from lint * Add Delegate to Types as well ... it seems required for platform * Remove duplicate source * Restyle --------- Co-authored-by: Andrei Litvin <[email protected]>
project-chip · Feb 8, 2024 · 1ad0e12 · 1ad0e12
1 parent 506c5fc
commit 1ad0e12
Show file tree

Hide file tree

Showing 10 changed files with 386 additions and 312 deletions.
diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -158,12 +158,6 @@ jobs:
                      --known-failure app/WriteHandler.h \
                      --known-failure inet/tests/TestInetLayerCommon.hpp \
                      --known-failure lib/core/CHIPVendorIdentifiers.hpp \
-                     --known-failure lib/dnssd/Constants.h \
-                     --known-failure lib/dnssd/minimal_mdns/core/FlatAllocatedQName.h \
-                     --known-failure lib/dnssd/minimal_mdns/core/HeapQName.h \
-                     --known-failure lib/dnssd/minimal_mdns/ListenIterator.h \
-                     --known-failure lib/dnssd/minimal_mdns/tests/CheckOnlyServer.h \
-                     --known-failure lib/dnssd/platform/DnssdBrowseDelegate.h \
                      --known-failure lib/support/CHIPArgParser.hpp \
                      --known-failure messaging/tests/echo/common.h \
                      --known-failure platform/DeviceSafeQueue.cpp \

diff --git a/src/app/server/BUILD.gn b/src/app/server/BUILD.gn
@@ -55,6 +55,7 @@ static_library("server") {
     "${chip_root}/src/app/icd/server:observer",
     "${chip_root}/src/lib/address_resolve",
     "${chip_root}/src/lib/dnssd",
+    "${chip_root}/src/lib/dnssd:naming",
     "${chip_root}/src/messaging",
     "${chip_root}/src/platform",
     "${chip_root}/src/protocols",

diff --git a/src/lib/dnssd/BUILD.gn b/src/lib/dnssd/BUILD.gn
@@ -16,13 +16,50 @@ import("//build_overrides/chip.gni")
 import("//build_overrides/nlunit_test.gni")
 import("${chip_root}/src/platform/device.gni")
 
+source_set("constants") {
+  sources = [ "Constants.h" ]
+
+  public_deps = [ "${chip_root}/src/lib/support" ]
+}
+
+source_set("types") {
+  sources = [ "Types.h" ]
+}
+
+source_set("naming") {
+  sources = [
+    "ServiceNaming.cpp",
+    "ServiceNaming.h",
+  ]
+
+  public_deps = [
+    ":constants",
+    ":types",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/lib/core:error",
+    "${chip_root}/src/lib/support:span",
+  ]
+}
+
 source_set("platform_header") {
-  sources = [ "platform/Dnssd.h" ]
+  sources = [
+    "platform/Dnssd.h",
+    "platform/DnssdBrowseDelegate.h",
+  ]
+  public_deps = [
+    ":constants",
+    ":naming",
+    "${chip_root}/src/inet",
+    "${chip_root}/src/lib/core",
+    "${chip_root}/src/system",
+  ]
 }
 
 static_library("dnssd") {
   public_deps = [
+    ":constants",
     ":platform_header",
+    ":types",
     "${chip_root}/src/app/icd/server:icd-server-config",
     "${chip_root}/src/crypto",
     "${chip_root}/src/lib/core",
@@ -37,8 +74,6 @@ static_library("dnssd") {
     "Resolver.h",
     "ResolverProxy.cpp",
     "ResolverProxy.h",
-    "ServiceNaming.cpp",
-    "ServiceNaming.h",
     "TxtFields.cpp",
     "TxtFields.h",
   ]