1 files changed, 32 insertions, 43 deletions

diff --git a/discovery/BUILD.gn b/discovery/BUILD.gn
index 11598c8f..dbf0ace8 100644
--- a/discovery/BUILD.gn
+++ b/discovery/BUILD.gn
@@ -5,20 +5,32 @@
 import("//build_overrides/build.gni")
 import("../testing/libfuzzer/fuzzer_test.gni")
 
-source_set("common") {
+source_set("public") {
   sources = [
     "common/config.h",
     "common/reporting_client.h",
+    "dnssd/public/dns_sd_instance.cc",
+    "dnssd/public/dns_sd_instance.h",
+    "dnssd/public/dns_sd_instance_endpoint.cc",
+    "dnssd/public/dns_sd_instance_endpoint.h",
+    "dnssd/public/dns_sd_publisher.h",
+    "dnssd/public/dns_sd_querier.h",
+    "dnssd/public/dns_sd_service.h",
+    "dnssd/public/dns_sd_txt_record.cc",
+    "dnssd/public/dns_sd_txt_record.h",
+    "mdns/public/mdns_constants.h",
+    "mdns/public/mdns_service.cc",
+    "mdns/public/mdns_service.h",
+    "public/dns_sd_service_factory.h",
+    "public/dns_sd_service_publisher.h",
+    "public/dns_sd_service_watcher.h",
   ]
-
+  public_deps = [ "../platform" ]
   deps = [ "../util" ]
-
-  public_deps = [
-    "../platform",
-    "../third_party/abseil",
-  ]
 }
 
+# TODO(https://issuetracker.google.com/issues/194234872):
+# Move implementation files to impl/
 source_set("mdns") {
   sources = [
     "mdns/mdns_domain_confirmed_provider.h",
@@ -47,21 +59,16 @@ source_set("mdns") {
     "mdns/mdns_trackers.h",
     "mdns/mdns_writer.cc",
     "mdns/mdns_writer.h",
-    "mdns/public/mdns_constants.h",
-    "mdns/public/mdns_service.cc",
-    "mdns/public/mdns_service.h",
   ]
 
-  deps = [ "../util" ]
-
-  public_deps = [
-    ":common",
+  public_deps = [ "../third_party/abseil" ]
+  deps = [
+    ":public",
     "../platform",
-    "../third_party/abseil",
+    "../util",
   ]
 }
 
-# TODO(issuetracker.google.com/179705382): Separate out a public target.
 source_set("dnssd") {
   sources = [
     "dnssd/impl/conversion_layer.cc",
@@ -82,34 +89,12 @@ source_set("dnssd") {
     "dnssd/impl/service_instance.h",
     "dnssd/impl/service_key.cc",
     "dnssd/impl/service_key.h",
-    "dnssd/public/dns_sd_instance.cc",
-    "dnssd/public/dns_sd_instance.h",
-    "dnssd/public/dns_sd_instance_endpoint.cc",
-    "dnssd/public/dns_sd_instance_endpoint.h",
-    "dnssd/public/dns_sd_publisher.h",
-    "dnssd/public/dns_sd_querier.h",
-    "dnssd/public/dns_sd_service.h",
-    "dnssd/public/dns_sd_txt_record.cc",
-    "dnssd/public/dns_sd_txt_record.h",
   ]
 
-  public_deps = [
-    ":common",
+  deps = [
     ":mdns",
-    "../util",
-  ]
-}
-
-source_set("public") {
-  sources = [
-    "public/dns_sd_service_factory.h",
-    "public/dns_sd_service_publisher.h",
-    "public/dns_sd_service_watcher.h",
-  ]
-
-  public_deps = [
-    ":common",
-    ":dnssd",
+    ":public",
+    "../third_party/abseil",
     "../util",
   ]
 }
@@ -133,8 +118,9 @@ source_set("testing") {
     sources += [ "mdns/testing/hash_test_util_abseil.h" ]
   }
 
-  public_deps = [
+  deps = [
     ":mdns",
+    ":public",
     "../third_party/abseil",
     "../third_party/googletest:gmock",
     "../third_party/googletest:gtest",
@@ -185,7 +171,10 @@ source_set("unittests") {
 openscreen_fuzzer_test("mdns_fuzzer") {
   sources = [ "mdns/mdns_reader_fuzztest.cc" ]
 
-  deps = [ ":mdns" ]
+  deps = [
+    ":mdns",
+    ":public",
+  ]
 
   seed_corpus = "mdns/fuzzer_seeds"