Fix chrome build, add unit testing in Chrome

This patch contains preparation for running Open Screen unit tests in
Chrome, as well as successfully linking in the Chrome platform
implementation for Open Screen's platform target.

See the follow up patch here:
https://chromium-review.googlesource.com/c/chromium/src/+/1880544

Change-Id: I32c1bd728a43c5dbe155bcaa11527ad275c6b871
Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1887717
Commit-Queue: Jordan Bayles <jophba@chromium.org>
Reviewed-by: Yuri Wiitala <miu@chromium.org>

29 files changed, 130 insertions, 108 deletions

diff --git a/BUILD.gn b/BUILD.gn
index b2f59afe..6667521f 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -23,9 +23,7 @@ group("gn_all") {
     "third_party/abseil",
     "third_party/boringssl",
     "third_party/jsoncpp",
-    "third_party/protobuf:protoc",
     "third_party/tinycbor",
-    "third_party/zlib",
     "tools/cddl",
     "util",
   ]
@@ -45,17 +43,22 @@ group("gn_all") {
   if (use_chromium_quic && use_mdns_responder) {
     deps += [ "osp:osp_demo" ]
   }
+
+  if (!build_with_chromium) {
+    deps += [
+      "third_party/protobuf:protoc",
+      "third_party/zlib",
+    ]
+  }
 }
 
-executable("openscreen_unittests") {
+source_set("openscreen_unittests_all") {
   testonly = true
-  deps = [
+  public_deps = [
     "cast/common:unittests",
     "cast/sender:unittests",
     "discovery:unittests",
     "osp:unittests",
-    "osp/impl/discovery/mdns:unittests",
-    "osp/impl/testing:unittests",
     "osp/msgs:unittests",
     "platform:unittests",
     "streaming/cast:unittests",
@@ -63,4 +66,22 @@ executable("openscreen_unittests") {
     "third_party/googletest:gtest_main",
     "util:unittests",
   ]
+
+  if (use_mdns_responder) {
+    public_deps += [
+      "osp/impl/discovery/mdns:unittests",
+
+      # Currently this target only includes mDNS tests.
+      "osp/impl/testing:unittests",
+    ]
+  }
+}
+
+if (!build_with_chromium) {
+  executable("openscreen_unittests") {
+    testonly = true
+    deps = [
+      ":openscreen_unittests_all",
+    ]
+  }
 }
diff --git a/DEPS b/DEPS
index 9d347fe7..73599236 100644
--- a/DEPS
+++ b/DEPS
@@ -83,7 +83,7 @@ deps = {
 
     'third_party/chromium_quic/src': {
         'url': Var('chromium_git') + '/openscreen/quic.git' +
-            '@' + '9a1c004d7930e1a4c4f9d4af51b6c5f88c619415',
+            '@' + 'b73bd98ac9eaedf01a732b1933f97112cf247d93',
         'condition': 'not build_with_chromium',
     },
 
diff --git a/build/BUILD.gn b/build/BUILD.gn
index 3a3fae17..ecf3b818 100644
--- a/build/BUILD.gn
+++ b/build/BUILD.gn
@@ -2,16 +2,18 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//build_overrides/build.gni")
+# This config must be set manually in build targets, but can be used both
+# in standalone and embedded builds. Setting default_include_dirs doesn't work
+# in embedded builds, because GN does not allow for multiple BUILDCONFIG.gn
+# files to be included, or for multiple sets of default configs to be toggled
+# on a single target type (e.g. source_set, static_library)
+config("openscreen_include_dirs") {
+  openscreen_root = get_path_info("../", "abspath")
 
-config("default_include_dirs") {
-  include_dirs = [ "//" ]
-}
+  defines = [ "OPENSCREEN_TEST_DATA_DIR=\".${openscreen_root}test/data/\"" ]
 
-# Embedders like Chromium skip all of our configs, which can break
-# include resolution, among other things
-config("allow_build_from_embedder") {
-  if (build_with_chromium) {
-    include_dirs = [ "//third_party/openscreen/src" ]
-  }
+  include_dirs = [
+    "$openscreen_root",
+    "$root_gen_dir/$openscreen_root",
+  ]
 }
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 5a8724da..359ae15c 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -134,7 +134,6 @@ _shared_binary_target_configs = [
   "//build/config:default_sanitizers",
   "//build/config:compiler_defaults",
   "//build/config:default_optimization",
-  "//build:default_include_dirs",
 ]
 
 # Apply that default list to the binary target types.
diff --git a/cast/common/BUILD.gn b/cast/common/BUILD.gn
index 4ec3034a..a5c04ec5 100644
--- a/cast/common/BUILD.gn
+++ b/cast/common/BUILD.gn
@@ -57,6 +57,7 @@ source_set("channel") {
 
 proto_library("channel_proto") {
   sources = [
+    "channel/proto/authority_keys.proto",
     "channel/proto/cast_channel.proto",
   ]
 }
diff --git a/cast/common/certificate/cast_cert_validator_unittest.cc b/cast/common/certificate/cast_cert_validator_unittest.cc
index 7b0ee1d7..c29de9cc 100644
--- a/cast/common/certificate/cast_cert_validator_unittest.cc
+++ b/cast/common/certificate/cast_cert_validator_unittest.cc
@@ -156,7 +156,7 @@ DateTime MarchFirst2037() {
   return CreateDate(2037, 3, 1);
 }
 
-#define TEST_DATA_PREFIX "test/data/cast/common/certificate/"
+#define TEST_DATA_PREFIX OPENSCREEN_TEST_DATA_DIR "/cast/common/certificate/"
 
 // Tests verifying a valid certificate chain of length 2:
 //
diff --git a/cast/common/certificate/cast_crl_unittest.cc b/cast/common/certificate/cast_crl_unittest.cc
index de3d922e..e514756c 100644
--- a/cast/common/certificate/cast_crl_unittest.cc
+++ b/cast/common/certificate/cast_crl_unittest.cc
@@ -85,7 +85,7 @@ bool TestVerifyRevocation(CastCertError expected_result,
   return expected_result == result.code();
 }
 
-#define TEST_DATA_PREFIX "test/data/cast/common/certificate/"
+#define TEST_DATA_PREFIX OPENSCREEN_TEST_DATA_DIR "cast/common/certificate/"
 
 bool RunTest(const DeviceCertTest& test_case) {
   std::unique_ptr<TrustStore> crl_trust_store;
diff --git a/cast/common/channel/proto/authority_keys.proto b/cast/common/channel/proto/authority_keys.proto
new file mode 100644
index 00000000..5689e364
--- /dev/null
+++ b/cast/common/channel/proto/authority_keys.proto
@@ -0,0 +1,17 @@
+// Copyright 2019 The Chromium Authors. All rights reserved.
+// Use of this source code is governed by a BSD-style license that can be
+// found in the LICENSE file.
+
+syntax = "proto2";
+
+option optimize_for = LITE_RUNTIME;
+
+package cast_channel.proto;
+
+message AuthorityKeys {
+  message Key {
+    required bytes fingerprint = 1;
+    required bytes public_key = 2;
+  }
+  repeated Key keys = 1;
+}
diff --git a/cast/sender/channel/cast_auth_util_unittest.cc b/cast/sender/channel/cast_auth_util_unittest.cc
index 61d49aa1..be8c71e7 100644
--- a/cast/sender/channel/cast_auth_util_unittest.cc
+++ b/cast/sender/channel/cast_auth_util_unittest.cc
@@ -99,7 +99,7 @@ bool ConvertTimeSeconds(const certificate::DateTime& time, uint64_t* seconds) {
   return true;
 }
 
-#define TEST_DATA_PREFIX "test/data/cast/common/certificate/"
+#define TEST_DATA_PREFIX OPENSCREEN_TEST_DATA_DIR "cast/common/certificate/"
 
 class CastAuthUtilTest : public testing::Test {
  public:
diff --git a/discovery/BUILD.gn b/discovery/BUILD.gn
index 158c9cb1..3a4a2363 100644
--- a/discovery/BUILD.gn
+++ b/discovery/BUILD.gn
@@ -28,12 +28,13 @@ source_set("mdns") {
   ]
 
   deps = [
-    "../platform",
-    "../third_party/abseil",
     "../util",
   ]
 
-  configs += [ "../../build:allow_build_from_embedder" ]
+  public_deps = [
+    "../platform",
+    "../third_party/abseil",
+  ]
 }
 
 source_set("dnssd") {
@@ -58,11 +59,7 @@ source_set("dnssd") {
 
   deps = [
     ":mdns",
-    "../platform",
-    "../third_party/abseil",
   ]
-
-  configs += [ "../build:allow_build_from_embedder" ]
 }
 
 source_set("unittests") {
@@ -87,12 +84,8 @@ source_set("unittests") {
   deps = [
     ":dnssd",
     ":mdns",
-    "../platform",
-    "../third_party/abseil",
     "../third_party/googletest:gmock",
     "../third_party/googletest:gtest",
     "../util",
   ]
-
-  configs += [ "../../build:allow_build_from_embedder" ]
 }
diff --git a/discovery/dnssd/impl/dns_data_unittest.cc b/discovery/dnssd/impl/dns_data_unittest.cc
index 5427ba3a..8d7edc8c 100644
--- a/discovery/dnssd/impl/dns_data_unittest.cc
+++ b/discovery/dnssd/impl/dns_data_unittest.cc
@@ -33,10 +33,10 @@ class DnsDataTesting : public DnsData {
     SetVariable(new_aaaa, aaaa(), DnsType::kAAAA);
   }
 
-  const absl::optional<SrvRecordRdata>& srv() { return srv_; };
-  const absl::optional<TxtRecordRdata>& txt() { return txt_; };
-  const absl::optional<ARecordRdata>& a() { return a_; };
-  const absl::optional<AAAARecordRdata>& aaaa() { return aaaa_; };
+  const absl::optional<SrvRecordRdata>& srv() { return srv_; }
+  const absl::optional<TxtRecordRdata>& txt() { return txt_; }
+  const absl::optional<ARecordRdata>& a() { return a_; }
+  const absl::optional<AAAARecordRdata>& aaaa() { return aaaa_; }
 
  private:
   template <typename T>
diff --git a/discovery/dnssd/public/instance_record.h b/discovery/dnssd/public/instance_record.h
index 0bccb0ec..253030c1 100644
--- a/discovery/dnssd/public/instance_record.h
+++ b/discovery/dnssd/public/instance_record.h
@@ -51,7 +51,7 @@ class DnsSdInstanceRecord {
   const absl::optional<IPEndpoint>& address_v6() const { return address_v6_; }
 
   // Returns the TXT record associated with this DNS-SD record
-  const DnsSdTxtRecord& txt() const { return txt_; };
+  const DnsSdTxtRecord& txt() const { return txt_; }
 
  private:
   DnsSdInstanceRecord(std::string instance_id,
diff --git a/discovery/mdns/mdns_trackers.cc b/discovery/mdns/mdns_trackers.cc
index 7c4c7e1f..b0597613 100644
--- a/discovery/mdns/mdns_trackers.cc
+++ b/discovery/mdns/mdns_trackers.cc
@@ -147,7 +147,7 @@ bool MdnsRecordTracker::IsStarted() {
   OSP_DCHECK(task_runner_->IsRunningOnTaskRunner());
 
   return record_.has_value();
-};
+}
 
 void MdnsRecordTracker::SendQuery() {
   const MdnsRecord& record = record_.value();
@@ -221,7 +221,7 @@ bool MdnsQuestionTracker::IsStarted() {
   OSP_DCHECK(task_runner_->IsRunningOnTaskRunner());
 
   return question_.has_value();
-};
+}
 
 void MdnsQuestionTracker::AddCallback(MdnsRecordChangedCallback* callback) {
   OSP_DCHECK(task_runner_->IsRunningOnTaskRunner());
diff --git a/osp/BUILD.gn b/osp/BUILD.gn
index d34b18bd..031ae2ea 100644
--- a/osp/BUILD.gn
+++ b/osp/BUILD.gn
@@ -11,7 +11,6 @@ source_set("osp") {
   deps = [
     "impl",
   ]
-  configs += [ "../build:allow_build_from_embedder" ]
 }
 
 if (use_chromium_quic) {
@@ -51,13 +50,14 @@ source_set("unittests") {
     "../third_party/googletest:gtest",
     "impl",
     "impl/quic:test_support",
-    "impl/testing",
     "public",
     "public:test_support",
   ]
 
   if (use_mdns_responder) {
     sources += [ "impl/mdns_responder_service_unittest.cc" ]
+
+    deps += [ "impl/testing" ]
   }
 }
 
diff --git a/osp/impl/discovery/mdns/BUILD.gn b/osp/impl/discovery/mdns/BUILD.gn
index ab9633c5..4779f526 100644
--- a/osp/impl/discovery/mdns/BUILD.gn
+++ b/osp/impl/discovery/mdns/BUILD.gn
@@ -3,6 +3,7 @@
 # found in the LICENSE file.
 
 import("../../../build/config/services.gni")
+assert(use_mdns_responder)
 
 source_set("mdns_interface") {
   sources = [
@@ -31,39 +32,35 @@ source_set("unittests") {
     "../../../../third_party/googletest:gtest",
   ]
 
-  if (use_mdns_responder) {
-    sources += [ "mdns_responder_adapter_impl_unittest.cc" ]
-    deps += [ ":mdns" ]
-  }
+  sources += [ "mdns_responder_adapter_impl_unittest.cc" ]
+  deps += [ ":mdns" ]
 }
 
-if (use_mdns_responder) {
-  executable("mdns_demo") {
-    sources = [
-      "mdns_demo.cc",
-    ]
+executable("mdns_demo") {
+  sources = [
+    "mdns_demo.cc",
+  ]
 
-    deps = [
-      ":mdns",
-    ]
-  }
+  deps = [
+    ":mdns",
+  ]
+}
 
-  source_set("mdns") {
-    sources = [
-      "mdns_responder_adapter_impl.cc",
-      "mdns_responder_adapter_impl.h",
-      "mdns_responder_platform.cc",
-      "mdns_responder_platform.h",
-    ]
+source_set("mdns") {
+  sources = [
+    "mdns_responder_adapter_impl.cc",
+    "mdns_responder_adapter_impl.h",
+    "mdns_responder_platform.cc",
+    "mdns_responder_platform.h",
+  ]
 
-    public_deps = [
-      ":mdns_interface",
-      "../../../../platform",
-      "../../../../util",
-    ]
+  public_deps = [
+    ":mdns_interface",
+    "../../../../platform",
+    "../../../../util",
+  ]
 
-    deps = [
-      "../../../../third_party/mDNSResponder:core",
-    ]
-  }
+  deps = [
+    "../../../../third_party/mDNSResponder:core",
+  ]
 }
diff --git a/osp/impl/quic/testing/quic_test_support.h b/osp/impl/quic/testing/quic_test_support.h
index 53ac48c3..ae6f5c67 100644
--- a/osp/impl/quic/testing/quic_test_support.h
+++ b/osp/impl/quic/testing/quic_test_support.h
@@ -18,8 +18,8 @@
 #include "platform/api/time.h"
 #include "platform/api/udp_socket.h"
 #include "platform/base/ip_address.h"
-#include "platform/impl/task_runner.h"
 #include "platform/test/fake_clock.h"
+#include "platform/test/fake_task_runner.h"
 #include "platform/test/fake_udp_socket.h"
 
 namespace openscreen {
diff --git a/osp/impl/testing/BUILD.gn b/osp/impl/testing/BUILD.gn
index 29176854..94bcc504 100644
--- a/osp/impl/testing/BUILD.gn
+++ b/osp/impl/testing/BUILD.gn
@@ -2,6 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+import("../../build/config/services.gni")
+assert(use_mdns_responder)
+
 source_set("testing") {
   testonly = true
   sources = [
@@ -12,9 +15,12 @@ source_set("testing") {
   ]
 
   deps = [
-    "../../../platform",
     "../discovery/mdns:mdns_interface",
   ]
+
+  public_deps = [
+    "../../../platform",
+  ]
 }
 
 source_set("unittests") {
diff --git a/osp/msgs/BUILD.gn b/osp/msgs/BUILD.gn
index 898ce915..0e18ea99 100644
--- a/osp/msgs/BUILD.gn
+++ b/osp/msgs/BUILD.gn
@@ -17,8 +17,10 @@ source_set("msgs") {
     "../../third_party/tinycbor",
   ]
 
-  public_configs = [ ":cddl_gen_config" ]
-  configs += [ "../../build:allow_build_from_embedder" ]
+  public_configs = [
+    ":cddl_gen_config",
+    "../../build:openscreen_include_dirs",
+  ]
 }
 
 config("cddl_gen_config") {
@@ -75,6 +77,4 @@ source_set("unittests") {
     ":msgs",
     "../../third_party/googletest:gtest",
   ]
-
-  configs += [ "../../build:allow_build_from_embedder" ]
 }
diff --git a/osp/public/BUILD.gn b/osp/public/BUILD.gn
index 20d5ed43..779d1d9a 100644
--- a/osp/public/BUILD.gn
+++ b/osp/public/BUILD.gn
@@ -46,8 +46,6 @@ source_set("public") {
     "../../platform",
     "../../util",
   ]
-
-  configs += [ "../../build:allow_build_from_embedder" ]
 }
 
 source_set("test_support") {
diff --git a/platform/BUILD.gn b/platform/BUILD.gn
index 88462f13..075d3b59 100644
--- a/platform/BUILD.gn
+++ b/platform/BUILD.gn
@@ -54,7 +54,7 @@ source_set("platform") {
     "../util",
   ]
 
-  configs += [ "../build:allow_build_from_embedder" ]
+  public_configs = [ "../build:openscreen_include_dirs" ]
 
   if (!build_with_chromium) {
     sources += [
@@ -139,8 +139,6 @@ source_set("test") {
     "test/trace_logging_helpers.h",
   ]
 
-  configs += [ "../build:allow_build_from_embedder" ]
-
   deps = [
     ":platform",
     "../third_party/googletest:gmock",
@@ -156,8 +154,6 @@ source_set("default_logger") {
     sources += [ "impl/log_initializer_posix.cc" ]
   }
 
-  configs += [ "../build:allow_build_from_embedder" ]
-
   deps = [
     "../third_party/abseil",
     "../util",
@@ -206,6 +202,4 @@ source_set("unittests") {
     "../third_party/googletest:gmock",
     "../third_party/googletest:gtest",
   ]
-
-  configs += [ "../build:allow_build_from_embedder" ]
 }
diff --git a/streaming/cast/BUILD.gn b/streaming/cast/BUILD.gn
index f8b9fcd1..3408f91e 100644
--- a/streaming/cast/BUILD.gn
+++ b/streaming/cast/BUILD.gn
@@ -46,6 +46,8 @@ source_set("common") {
     "ssrc.h",
   ]
 
+  public_configs = [ "../../build:openscreen_include_dirs" ]
+
   public_deps = [
     "../../third_party/abseil",
     "../../third_party/boringssl",
diff --git a/third_party/abseil/BUILD.gn b/third_party/abseil/BUILD.gn
index f1c14729..4c512c8b 100644
--- a/third_party/abseil/BUILD.gn
+++ b/third_party/abseil/BUILD.gn
@@ -7,6 +7,7 @@ import("//build_overrides/build.gni")
 if (build_with_chromium) {
   source_set("abseil") {
     public_deps = [
+      "//third_party/abseil-cpp/absl/hash",
       "//third_party/abseil-cpp/absl/strings",
       "//third_party/abseil-cpp/absl/types:optional",
       "//third_party/abseil-cpp/absl/types:variant",
@@ -88,7 +89,6 @@ if (build_with_chromium) {
 
     configs -= [ "//build/config:symbol_visibility_hidden" ]
     configs += [ "//build/config:symbol_visibility_default" ]
-    configs -= [ "//build:default_include_dirs" ]
 
     configs += [ ":private_abseil_config" ]
     public_configs = [ ":abseil_config" ]
diff --git a/third_party/boringssl/BUILD.gn b/third_party/boringssl/BUILD.gn
index a43fbba9..6bfebca5 100644
--- a/third_party/boringssl/BUILD.gn
+++ b/third_party/boringssl/BUILD.gn
@@ -94,7 +94,5 @@ if (build_with_chromium) {
 
     public_configs = [ ":external_config" ]
     configs += [ ":internal_config" ]
-
-    configs -= [ "//build:default_include_dirs" ]
   }
 }
diff --git a/third_party/chromium_quic/BUILD.gn b/third_party/chromium_quic/BUILD.gn
index 8495d904..2cf14c00 100644
--- a/third_party/chromium_quic/BUILD.gn
+++ b/third_party/chromium_quic/BUILD.gn
@@ -65,7 +65,6 @@ executable("quic_demo_client") {
   deps = [
     ":chromium_quic",
   ]
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":chromium_quic_config" ]
 }
 
@@ -78,7 +77,6 @@ executable("quic_demo_server") {
   deps = [
     ":chromium_quic",
   ]
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":chromium_quic_config" ]
 }
 
@@ -212,7 +210,6 @@ source_set("core") {
   #   "src/net/third_party/quic/core/quic_packet_reader.cc",
   #   "src/net/third_party/quic/core/quic_packet_reader.h",
   # ]
-  configs -= [ "//build:default_include_dirs" ]
   configs += [
     ":chromium_quic_config",
     "//third_party/protobuf:using_proto",
@@ -257,7 +254,6 @@ source_set("congestion_control") {
     "src/net/third_party/quic/core/congestion_control/windowed_filter.h",
   ]
 
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":chromium_quic_config" ]
 }
 
@@ -348,7 +344,6 @@ source_set("crypto") {
     ":proto",
   ]
 
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":chromium_quic_config" ]
 }
 
@@ -394,7 +389,6 @@ source_set("frames") {
     "src/net/third_party/quic/core/frames/quic_window_update_frame.h",
   ]
 
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":chromium_quic_config" ]
 }
 
@@ -404,7 +398,6 @@ proto_library("proto") {
     "src/net/third_party/quic/core/proto/source_address_token.proto",
   ]
 
-  removed_configs = [ "//build:default_include_dirs" ]
   extra_configs = [ ":chromium_quic_config" ]
 }
 
@@ -424,7 +417,6 @@ source_set("quartc") {
     ":core",
   ]
 
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":chromium_quic_config" ]
 }
 
@@ -532,7 +524,6 @@ source_set("platform") {
     "src/net/third_party/quic/platform/impl/quic_url_utils_impl.h",
   ]
 
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":chromium_quic_config" ]
 }
 
diff --git a/third_party/chromium_quic/build/base/BUILD.gn b/third_party/chromium_quic/build/base/BUILD.gn
index d76194e0..aefbef77 100644
--- a/third_party/chromium_quic/build/base/BUILD.gn
+++ b/third_party/chromium_quic/build/base/BUILD.gn
@@ -715,7 +715,6 @@ source_set("base") {
     "../../src/third_party",
   ]
 
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":base_config" ]
 }
 
@@ -765,7 +764,6 @@ source_set("libevent") {
     ]
   }
 
-  configs -= [ "//build:default_include_dirs" ]
   configs += [ ":base_config" ]
   include_dirs = [ "third_party/libevent" ]
 }
diff --git a/third_party/googletest/BUILD.gn b/third_party/googletest/BUILD.gn
index 110f5ae9..f76f9e74 100644
--- a/third_party/googletest/BUILD.gn
+++ b/third_party/googletest/BUILD.gn
@@ -7,7 +7,10 @@ import("//build_overrides/build.gni")
 if (build_with_chromium) {
   source_set("gmock") {
     testonly = true
-    public_configs = [ "//build/config/compiler:default_include_dirs" ]
+    public_configs = [
+      "//build/config/compiler:default_include_dirs",
+      "../../build:openscreen_include_dirs",
+    ]
     public_deps = [
       "//third_party/googletest:gmock",
     ]
@@ -15,7 +18,10 @@ if (build_with_chromium) {
 
   source_set("gtest") {
     testonly = true
-    public_configs = [ "//build/config/compiler:default_include_dirs" ]
+    public_configs = [
+      "//build/config/compiler:default_include_dirs",
+      "../../build:openscreen_include_dirs",
+    ]
     public_deps = [
       "//third_party/googletest:gtest",
     ]
@@ -23,7 +29,10 @@ if (build_with_chromium) {
 
   source_set("gtest_main") {
     testonly = true
-    public_configs = [ "//build/config/compiler:default_include_dirs" ]
+    public_configs = [
+      "//build/config/compiler:default_include_dirs",
+      "../../build:openscreen_include_dirs",
+    ]
     public_deps = [
       "//third_party/googletest:gtest_main",
     ]
diff --git a/third_party/tinycbor/BUILD.gn b/third_party/tinycbor/BUILD.gn
index 9a9d5524..ff8480fc 100644
--- a/third_party/tinycbor/BUILD.gn
+++ b/third_party/tinycbor/BUILD.gn
@@ -16,7 +16,5 @@ source_set("tinycbor") {
     "src/src/utf8_p.h",
   ]
 
-  configs += [ "../../build:allow_build_from_embedder" ]
-
   defines = [ "WITHOUT_OPEN_MEMSTREAM" ]
 }
diff --git a/tools/cddl/BUILD.gn b/tools/cddl/BUILD.gn
index 84819bde..45274178 100644
--- a/tools/cddl/BUILD.gn
+++ b/tools/cddl/BUILD.gn
@@ -22,6 +22,6 @@ if (current_toolchain == host_toolchain) {
       "../../third_party/abseil",
     ]
 
-    configs += [ "../../build:allow_build_from_embedder" ]
+    configs += [ "../../build:openscreen_include_dirs" ]
   }
 }
diff --git a/util/BUILD.gn b/util/BUILD.gn
index 7905eee7..de31d291 100644
--- a/util/BUILD.gn
+++ b/util/BUILD.gn
@@ -38,7 +38,7 @@ source_set("util") {
     "../third_party/jsoncpp",
   ]
 
-  configs += [ "../build:allow_build_from_embedder" ]
+  public_configs = [ "../build:openscreen_include_dirs" ]
 }
 
 source_set("unittests") {
@@ -66,6 +66,4 @@ source_set("unittests") {
     "../third_party/googletest:gtest",
     "../third_party/jsoncpp",
   ]
-
-  configs += [ "../build:allow_build_from_embedder" ]
 }