1 files changed, 25 insertions, 11 deletions
diff --git a/platform/BUILD.gn b/platform/BUILD.gn
index e98067f1..304c0853 100644
--- a/platform/BUILD.gn
+++ b/platform/BUILD.gn
@@ -33,6 +33,15 @@ source_set("base") {
   public_configs = [ "../build:openscreen_include_dirs" ]
 }
 
+# Public API source files. May depend on nothing except :base.
+source_set("logging") {
+  defines = []
+
+  sources = [ "api/logging.h" ]
+
+  public_deps = [ ":base" ]
+}
+
 # Public API source files. These may depend on nothing except :base.
 source_set("api") {
   defines = []
@@ -56,7 +65,10 @@ source_set("api") {
     "api/udp_socket.h",
   ]
 
-  public_deps = [ ":base" ]
+  public_deps = [
+    ":base",
+    ":logging",
+  ]
 }
 
 # The following target is only activated in standalone builds (see :platform).
@@ -211,10 +223,22 @@ source_set("unittests") {
     "base/udp_packet_unittest.cc",
   ]
 
+  deps = [
+    ":platform",
+    ":test",
+    "../third_party/abseil",
+    "../third_party/boringssl",
+    "../third_party/googletest:gmock",
+    "../third_party/googletest:gtest",
+    "../util",
+  ]
+
   # The socket integration tests assume that you can Bind with UDP sockets,
   # which is simply not true when we are built inside of Chromium.
   if (!build_with_chromium) {
     sources += [ "api/socket_integration_unittest.cc" ]
+
+    deps += [ ":standalone_impl" ]
   }
 
   # The unit tests in impl/ assume the standalone implementation is being used.
@@ -238,14 +262,4 @@ source_set("unittests") {
       ]
     }
   }
-
-  deps = [
-    ":platform",
-    ":test",
-    "../third_party/abseil",
-    "../third_party/boringssl",
-    "../third_party/googletest:gmock",
-    "../third_party/googletest:gtest",
-    "../util",
-  ]
 }