aboutsummaryrefslogtreecommitdiff
path: root/cast
diff options
context:
space:
mode:
authorJordan Bayles <jophba@chromium.org>2021-06-22 11:28:50 -0700
committerOpenscreen LUCI CQ <openscreen-scoped@luci-project-accounts.iam.gserviceaccount.com>2021-06-24 02:35:56 +0000
commitf3b911c8dbd011a8f96802ad6e3a4998799ebd9c (patch)
tree75044e00a7e4033bf8005222426d19c1a91e0773 /cast
parent5139930c36d7f9e6949bbd5d9ec254aa111683d8 (diff)
downloadopenscreen-f3b911c8dbd011a8f96802ad6e3a4998799ebd9c.tar.gz
Fix GN check issues
This patch fixes various issues found through `gn check` throughout the repository, including some fuzzing issues. Bug: b/155434332 Change-Id: I2dffa42f5dfd291a7c59653eb7ca16ec680bfddb Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/2964569 Reviewed-by: Ryan Keane <rwkeane@google.com> Commit-Queue: Jordan Bayles <jophba@chromium.org>
Diffstat (limited to 'cast')
-rw-r--r--cast/common/BUILD.gn1
-rw-r--r--cast/protocol/BUILD.gn3
-rw-r--r--cast/standalone_receiver/BUILD.gn11
-rw-r--r--cast/standalone_receiver/streaming_playback_controller.cc8
-rw-r--r--cast/standalone_receiver/streaming_playback_controller.h8
-rw-r--r--cast/standalone_sender/BUILD.gn2
-rw-r--r--cast/test/BUILD.gn1
7 files changed, 21 insertions, 13 deletions
diff --git a/cast/common/BUILD.gn b/cast/common/BUILD.gn
index ae32bf4a..9e32e27d 100644
--- a/cast/common/BUILD.gn
+++ b/cast/common/BUILD.gn
@@ -107,6 +107,7 @@ if (!build_with_chromium) {
":public",
"../../discovery:dnssd",
"../../discovery:public",
+ "../../platform:standalone_impl",
"../../testing/util",
"../../third_party/googletest:gtest",
]
diff --git a/cast/protocol/BUILD.gn b/cast/protocol/BUILD.gn
index 590caed3..a68bb989 100644
--- a/cast/protocol/BUILD.gn
+++ b/cast/protocol/BUILD.gn
@@ -63,11 +63,14 @@ source_set("unittests") {
deps = [
":castv2",
+ ":castv2_schema_headers",
":receiver_examples",
":streaming_examples",
+ "../../platform:base",
"../../third_party/abseil",
"../../third_party/googletest:gmock",
"../../third_party/googletest:gtest",
+ "../../util:base",
"//third_party/valijson",
]
}
diff --git a/cast/standalone_receiver/BUILD.gn b/cast/standalone_receiver/BUILD.gn
index 0f9313c5..f1b5fd31 100644
--- a/cast/standalone_receiver/BUILD.gn
+++ b/cast/standalone_receiver/BUILD.gn
@@ -21,7 +21,12 @@ if (!build_with_chromium) {
]
shared_deps = [
+ "../../discovery:common",
+ "../../discovery:public",
+ "../../platform:standalone_impl",
"../common:public",
+ "../receiver:agent",
+ "../receiver:channel",
"../streaming:receiver",
]
@@ -65,11 +70,7 @@ if (!build_with_chromium) {
executable("cast_receiver") {
sources = [ "main.cc" ]
- deps = [
- "../receiver:agent",
- "../receiver:channel",
- ]
-
+ deps = shared_deps
configs += [ "../common:certificate_config" ]
if (have_external_libs) {
diff --git a/cast/standalone_receiver/streaming_playback_controller.cc b/cast/standalone_receiver/streaming_playback_controller.cc
index 918653f5..2a39ab8e 100644
--- a/cast/standalone_receiver/streaming_playback_controller.cc
+++ b/cast/standalone_receiver/streaming_playback_controller.cc
@@ -7,11 +7,11 @@
#include <string>
#if defined(CAST_STANDALONE_RECEIVER_HAVE_EXTERNAL_LIBS)
-#include "cast/standalone_receiver/sdl_audio_player.h"
-#include "cast/standalone_receiver/sdl_glue.h"
-#include "cast/standalone_receiver/sdl_video_player.h"
+#include "cast/standalone_receiver/sdl_audio_player.h" // nogncheck
+#include "cast/standalone_receiver/sdl_glue.h" // nogncheck
+#include "cast/standalone_receiver/sdl_video_player.h" // nogncheck
#else
-#include "cast/standalone_receiver/dummy_player.h"
+#include "cast/standalone_receiver/dummy_player.h" // nogncheck
#endif // defined(CAST_STANDALONE_RECEIVER_HAVE_EXTERNAL_LIBS)
#include "util/trace_logging.h"
diff --git a/cast/standalone_receiver/streaming_playback_controller.h b/cast/standalone_receiver/streaming_playback_controller.h
index 5a743bf6..ea288046 100644
--- a/cast/standalone_receiver/streaming_playback_controller.h
+++ b/cast/standalone_receiver/streaming_playback_controller.h
@@ -11,11 +11,11 @@
#include "platform/impl/task_runner.h"
#if defined(CAST_STANDALONE_RECEIVER_HAVE_EXTERNAL_LIBS)
-#include "cast/standalone_receiver/sdl_audio_player.h"
-#include "cast/standalone_receiver/sdl_glue.h"
-#include "cast/standalone_receiver/sdl_video_player.h"
+#include "cast/standalone_receiver/sdl_audio_player.h" // nogncheck
+#include "cast/standalone_receiver/sdl_glue.h" // nogncheck
+#include "cast/standalone_receiver/sdl_video_player.h" // nogncheck
#else
-#include "cast/standalone_receiver/dummy_player.h"
+#include "cast/standalone_receiver/dummy_player.h" // nogncheck
#endif // defined(CAST_STANDALONE_RECEIVER_HAVE_EXTERNAL_LIBS)
namespace openscreen {
diff --git a/cast/standalone_sender/BUILD.gn b/cast/standalone_sender/BUILD.gn
index f48a53a5..d2d3619b 100644
--- a/cast/standalone_sender/BUILD.gn
+++ b/cast/standalone_sender/BUILD.gn
@@ -22,7 +22,9 @@ if (!build_with_chromium) {
executable("cast_sender") {
deps = [
+ "../../discovery:public",
"../../platform",
+ "../../platform:standalone_impl",
"../../third_party/jsoncpp",
"../../util",
"../common:public",
diff --git a/cast/test/BUILD.gn b/cast/test/BUILD.gn
index d37e6af2..c7569236 100644
--- a/cast/test/BUILD.gn
+++ b/cast/test/BUILD.gn
@@ -33,6 +33,7 @@ if (is_posix && !build_with_chromium) {
deps = [
"../../platform",
+ "../../platform:standalone_impl",
"../../testing/util",
"../../third_party/abseil",
"../../third_party/boringssl",