7 files changed, 139 insertions, 107 deletions
diff --git a/cast/common/BUILD.gn b/cast/common/BUILD.gn
new file mode 100644
index 00000000..4ec3034a
--- /dev/null
+++ b/cast/common/BUILD.gn
@@ -0,0 +1,92 @@
+# 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.
+
+import("//build_overrides/build.gni")
+import("//third_party/protobuf/proto_library.gni")
+
+source_set("certificate") {
+  sources = [
+    "certificate/cast_cert_validator.cc",
+    "certificate/cast_cert_validator.h",
+    "certificate/cast_cert_validator_internal.cc",
+    "certificate/cast_cert_validator_internal.h",
+    "certificate/cast_crl.cc",
+    "certificate/cast_crl.h",
+    "certificate/types.cc",
+    "certificate/types.h",
+  ]
+  public_deps = [
+    "../../third_party/boringssl",
+  ]
+
+  deps = [
+    ":certificate_proto",
+    "../../platform",
+    "../../third_party/abseil",
+    "../../util",
+  ]
+}
+
+proto_library("certificate_proto") {
+  sources = [
+    "certificate/proto/revocation.proto",
+  ]
+}
+
+source_set("channel") {
+  sources = [
+    "channel/cast_socket.cc",
+    "channel/cast_socket.h",
+    "channel/message_framer.cc",
+    "channel/message_framer.h",
+    "channel/message_util.h",
+  ]
+
+  deps = [
+    ":certificate_proto",
+    ":channel_proto",
+    "../../util",
+  ]
+
+  public_deps = [
+    "../../platform",
+    "../../third_party/abseil",
+  ]
+}
+
+proto_library("channel_proto") {
+  sources = [
+    "channel/proto/cast_channel.proto",
+  ]
+}
+
+source_set("unittests") {
+  testonly = true
+  sources = [
+    "certificate/cast_cert_validator_unittest.cc",
+    "certificate/cast_crl_unittest.cc",
+    "certificate/test_helpers.cc",
+    "certificate/test_helpers.h",
+    "channel/cast_socket_unittest.cc",
+    "channel/message_framer_unittest.cc",
+  ]
+
+  deps = [
+    ":certificate",
+    ":certificate_unittest_proto",
+    ":channel",
+    "../../platform",
+    "../../third_party/boringssl",
+    "../../third_party/googletest:gmock",
+    "../../third_party/googletest:gtest",
+    "../../util",
+  ]
+}
+
+proto_library("certificate_unittest_proto") {
+  testonly = true
+  sources = [
+    "certificate/proto/test_suite.proto",
+  ]
+}
diff --git a/cast/common/certificate/BUILD.gn b/cast/common/certificate/BUILD.gn
deleted file mode 100644
index 65000c5d..00000000
--- a/cast/common/certificate/BUILD.gn
+++ /dev/null
@@ -1,44 +0,0 @@
-# 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.
-
-source_set("certificate") {
-  sources = [
-    "cast_cert_validator.cc",
-    "cast_cert_validator.h",
-    "cast_cert_validator_internal.cc",
-    "cast_cert_validator_internal.h",
-    "cast_crl.cc",
-    "cast_crl.h",
-    "types.cc",
-    "types.h",
-  ]
-  public_deps = [
-    "../../../third_party/boringssl",
-  ]
-
-  deps = [
-    "../../../platform",
-    "../../../third_party/abseil",
-    "../../../util",
-    "proto",
-  ]
-}
-
-source_set("unittests") {
-  testonly = true
-  sources = [
-    "cast_cert_validator_unittest.cc",
-    "cast_crl_unittest.cc",
-    "test_helpers.cc",
-    "test_helpers.h",
-  ]
-
-  deps = [
-    ":certificate",
-    "../../../platform",
-    "../../../third_party/boringssl",
-    "../../../third_party/googletest:gtest",
-    "proto:unittest_proto",
-  ]
-}
diff --git a/cast/common/certificate/proto/BUILD.gn b/cast/common/certificate/proto/BUILD.gn
deleted file mode 100644
index 987a9f54..00000000
--- a/cast/common/certificate/proto/BUILD.gn
+++ /dev/null
@@ -1,18 +0,0 @@
-# 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.
-
-import("//third_party/protobuf/proto_library.gni")
-
-proto_library("proto") {
-  sources = [
-    "revocation.proto",
-  ]
-}
-
-proto_library("unittest_proto") {
-  testonly = true
-  sources = [
-    "test_suite.proto",
-  ]
-}
diff --git a/cast/sender/BUILD.gn b/cast/sender/BUILD.gn
new file mode 100644
index 00000000..05932260
--- /dev/null
+++ b/cast/sender/BUILD.gn
@@ -0,0 +1,38 @@
+# 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.
+
+source_set("channel") {
+  sources = [
+    "channel/cast_auth_util.cc",
+    "channel/cast_auth_util.h",
+    "channel/message_util.cc",
+    "channel/message_util.h",
+    "channel/sender_socket_factory.cc",
+    "channel/sender_socket_factory.h",
+  ]
+
+  deps = [
+    "../common:certificate_proto",
+    "../common:channel_proto",
+  ]
+
+  public_deps = [
+    "../../platform",
+  ]
+}
+
+source_set("unittests") {
+  testonly = true
+  sources = [
+    "channel/cast_auth_util_unittest.cc",
+  ]
+
+  deps = [
+    ":channel",
+    "../../platform",
+    "../../third_party/googletest:gtest",
+    "../common:certificate_proto",
+    "../common:certificate_unittest_proto",
+  ]
+}
diff --git a/cast/sender/channel/BUILD.gn b/cast/sender/channel/BUILD.gn
deleted file mode 100644
index 5fbed9ce..00000000
--- a/cast/sender/channel/BUILD.gn
+++ /dev/null
@@ -1,37 +0,0 @@
-# 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.
-
-source_set("channel") {
-  sources = [
-    "cast_auth_util.cc",
-    "cast_auth_util.h",
-    "message_util.cc",
-    "message_util.h",
-    "sender_socket_factory.cc",
-    "sender_socket_factory.h",
-  ]
-
-  deps = [
-    "../../common/channel/proto",
-  ]
-
-  public_deps = [
-    "../../../platform",
-  ]
-}
-
-source_set("unittests") {
-  testonly = true
-  sources = [
-    "cast_auth_util_unittest.cc",
-  ]
-
-  deps = [
-    ":channel",
-    "../../../platform",
-    "../../../third_party/googletest:gtest",
-    "../../common/certificate/proto:unittest_proto",
-    "../../common/channel/proto",
-  ]
-}
diff --git a/cast/common/channel/proto/BUILD.gn b/cast/streaming/BUILD.gn
index c3bfa439..af393e50 100644
--- a/cast/common/channel/proto/BUILD.gn
+++ b/cast/streaming/BUILD.gn
@@ -2,10 +2,15 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//third_party/protobuf/proto_library.gni")
-
-proto_library("proto") {
+source_set("streaming") {
   sources = [
-    "cast_channel.proto",
+    "reciever_config.h",
+    "sender_config.h",
+    "session_config.h",
+    "video_codec_params.h",
+  ]
+
+  public_deps = [
+    "../../streaming/cast:common",
   ]
 }
diff --git a/cast/streaming/sender_config.h b/cast/streaming/sender_config.h
index 1120203c..e8620f53 100644
--- a/cast/streaming/sender_config.h
+++ b/cast/streaming/sender_config.h
@@ -7,14 +7,10 @@
 
 #include <chrono>  // NOLINT
 #include <memory>
-#include <string>
 #include <utility>
-#include <vector>
 
-#include "absl/types/optional.h"
 #include "cast/streaming/session_config.h"
 #include "cast/streaming/video_codec_params.h"
-#include "streaming/cast/rtp_defines.h"
 
 namespace cast {
 namespace streaming {