diff options
| -rw-r--r-- | BUILD.gn | 33 | ||||
| -rw-r--r-- | cast/common/BUILD.gn | 2 | ||||
| -rw-r--r-- | osp/BUILD.gn | 17 | ||||
| -rw-r--r-- | osp/demo/README.md | 2 | ||||
| -rw-r--r-- | osp/demo/osp_demo.cc (renamed from osp/demo/demo.cc) | 2 | ||||
| -rw-r--r-- | osp/impl/discovery/mdns/BUILD.gn | 6 | ||||
| -rw-r--r-- | osp/impl/discovery/mdns/mdns_demo.cc (renamed from osp/impl/discovery/mdns/embedder_demo.cc) | 2 | ||||
| -rw-r--r-- | osp/impl/testing/BUILD.gn | 2 | ||||
| -rw-r--r-- | platform/BUILD.gn | 2 | ||||
| -rw-r--r-- | streaming/cast/BUILD.gn | 4 | ||||
| -rw-r--r-- | third_party/chromium_quic/BUILD.gn | 4 | ||||
| -rw-r--r-- | util/BUILD.gn | 2 |
12 files changed, 51 insertions, 27 deletions
@@ -10,10 +10,17 @@ import("osp/build/config/services.gni") group("gn_all") { deps = [ "cast/common:mdns", + "cast/common/certificate", + "cast/sender/channel", "osp", "osp/msgs", "platform", + "platform:default_logger", + "streaming/cast:receiver", + "streaming/cast:sender", "third_party/abseil", + "third_party/boringssl", + "third_party/jsoncpp", "third_party/protobuf:protoc", "third_party/tinycbor", "third_party/zlib", @@ -22,41 +29,45 @@ group("gn_all") { ] if (use_mdns_responder) { - deps += [ "osp/impl/discovery/mdns:embedder_demo" ] + deps += [ "osp/impl/discovery/mdns:mdns_demo" ] } if (use_chromium_quic) { deps += [ "third_party/chromium_quic", - "third_party/chromium_quic:demo_client", - "third_party/chromium_quic:demo_server", + "third_party/chromium_quic:quic_demo_client", + "third_party/chromium_quic:quic_demo_server", ] } + + if (use_chromium_quic && use_mdns_responder) { + deps += [ "osp:osp_demo" ] + } } executable("openscreen_unittests") { testonly = true deps = [ - "cast/common:mdns_unittests", + "cast/common:unittests", "cast/common/certificate:unittests", "cast/sender/channel:unittests", - "osp:osp_unittests", - "osp/impl/discovery/mdns:mdns_unittests", + "osp:unittests", + "osp/impl/discovery/mdns:unittests", "osp/msgs:unittests", - "platform:platform_unittests", - "streaming/cast:cast_unittests", + "platform:unittests", + "streaming/cast:unittests", "third_party/abseil", "third_party/googletest:gtest_main", - "util:util_unittests", + "util:unittests", ] } +# Note: Remove this after demo is removed from the build recipe. if (use_chromium_quic && use_mdns_responder) { executable("demo") { sources = [ - "osp/demo/demo.cc", + "osp/demo/osp_demo.cc", ] - deps = [ "//osp:osp_with_chromium_quic", "//osp/impl/discovery/mdns", diff --git a/cast/common/BUILD.gn b/cast/common/BUILD.gn index e0660172..465ac243 100644 --- a/cast/common/BUILD.gn +++ b/cast/common/BUILD.gn @@ -30,7 +30,7 @@ source_set("mdns") { configs += [ "../../build:allow_build_from_embedder" ] } -source_set("mdns_unittests") { +source_set("unittests") { testonly = true sources = [ diff --git a/osp/BUILD.gn b/osp/BUILD.gn index 8bdca4e8..d34b18bd 100644 --- a/osp/BUILD.gn +++ b/osp/BUILD.gn @@ -25,7 +25,7 @@ if (use_chromium_quic) { } } -source_set("osp_unittests") { +source_set("unittests") { testonly = true sources = [ @@ -52,7 +52,6 @@ source_set("osp_unittests") { "impl", "impl/quic:test_support", "impl/testing", - "impl/testing:fakes_unittests", "public", "public:test_support", ] @@ -61,3 +60,17 @@ source_set("osp_unittests") { sources += [ "impl/mdns_responder_service_unittest.cc" ] } } + +if (use_chromium_quic && use_mdns_responder) { + executable("osp_demo") { + sources = [ + "demo/osp_demo.cc", + ] + deps = [ + ":osp_with_chromium_quic", + "//osp/impl/discovery/mdns", + "//platform", + "//util", + ] + } +} diff --git a/osp/demo/README.md b/osp/demo/README.md index 96acd759..50637ca6 100644 --- a/osp/demo/README.md +++ b/osp/demo/README.md @@ -10,7 +10,7 @@ The same executable is run for the controller and receiver; only the command line options affect the behavior. The command line options are: ``` bash - $ demo [-v] [friendly_name] + $ osp_demo [-v] [friendly_name] ``` - `-v` enables verbose logging. diff --git a/osp/demo/demo.cc b/osp/demo/osp_demo.cc index 3966bc4b..7979f1b2 100644 --- a/osp/demo/demo.cc +++ b/osp/demo/osp_demo.cc @@ -594,7 +594,7 @@ InputArgs GetInputArgs(int argc, char** argv) { int main(int argc, char** argv) { using openscreen::platform::LogLevel; - std::cout << "Usage: demo [-v] [friendly_name]" << std::endl + std::cout << "Usage: osp_demo [-v] [friendly_name]" << std::endl << "-v: enable more verbose logging" << std::endl << "friendly_name: server name, runs the publisher demo." << std::endl diff --git a/osp/impl/discovery/mdns/BUILD.gn b/osp/impl/discovery/mdns/BUILD.gn index 6da373fb..ab9633c5 100644 --- a/osp/impl/discovery/mdns/BUILD.gn +++ b/osp/impl/discovery/mdns/BUILD.gn @@ -18,7 +18,7 @@ source_set("mdns_interface") { ] } -source_set("mdns_unittests") { +source_set("unittests") { testonly = true sources = [ @@ -38,9 +38,9 @@ source_set("mdns_unittests") { } if (use_mdns_responder) { - executable("embedder_demo") { + executable("mdns_demo") { sources = [ - "embedder_demo.cc", + "mdns_demo.cc", ] deps = [ diff --git a/osp/impl/discovery/mdns/embedder_demo.cc b/osp/impl/discovery/mdns/mdns_demo.cc index 10baacba..326cf7f3 100644 --- a/osp/impl/discovery/mdns/embedder_demo.cc +++ b/osp/impl/discovery/mdns/mdns_demo.cc @@ -23,7 +23,7 @@ // This file contains a demo of our mDNSResponder wrapper code. It can both // listen for mDNS services and advertise an mDNS service. The command-line // usage is: -// embedder_demo [service_type] [service_instance_name] +// mdns_demo [service_type] [service_instance_name] // service_type defaults to '_openscreen._udp' and service_instance_name // defaults to ''. service_type determines services the program listens for and // when service_instance_name is not empty, a service of diff --git a/osp/impl/testing/BUILD.gn b/osp/impl/testing/BUILD.gn index 4c0f6427..29176854 100644 --- a/osp/impl/testing/BUILD.gn +++ b/osp/impl/testing/BUILD.gn @@ -17,7 +17,7 @@ source_set("testing") { ] } -source_set("fakes_unittests") { +source_set("unittests") { testonly = true sources = [ "fake_mdns_platform_service_unittest.cc", diff --git a/platform/BUILD.gn b/platform/BUILD.gn index a5dc8bd2..cad52880 100644 --- a/platform/BUILD.gn +++ b/platform/BUILD.gn @@ -147,7 +147,7 @@ source_set("default_logger") { ] } -source_set("platform_unittests") { +source_set("unittests") { testonly = true sources = [ diff --git a/streaming/cast/BUILD.gn b/streaming/cast/BUILD.gn index f4f9fa84..f8b9fcd1 100644 --- a/streaming/cast/BUILD.gn +++ b/streaming/cast/BUILD.gn @@ -95,7 +95,7 @@ source_set("sender") { ] } -source_set("cast_unittests") { +source_set("unittests") { testonly = true sources = [ @@ -206,7 +206,7 @@ if (build_with_chromium) { # standalone, non-embedder //platform implementation; since they *are* the whole # application. if (!build_with_chromium) { - executable("receiver_demo") { + executable("streaming_receiver_demo") { sources = [ "receiver_demo/main.cc", ] diff --git a/third_party/chromium_quic/BUILD.gn b/third_party/chromium_quic/BUILD.gn index 9971472b..c8506fcc 100644 --- a/third_party/chromium_quic/BUILD.gn +++ b/third_party/chromium_quic/BUILD.gn @@ -56,7 +56,7 @@ source_set("chromium_quic") { ] } -executable("demo_client") { +executable("quic_demo_client") { sources = [ "demo/client.cc", "demo/delegates.cc", @@ -69,7 +69,7 @@ executable("demo_client") { configs += [ ":chromium_quic_config" ] } -executable("demo_server") { +executable("quic_demo_server") { sources = [ "demo/delegates.cc", "demo/delegates.h", diff --git a/util/BUILD.gn b/util/BUILD.gn index 95da0cea..288de0fe 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn @@ -39,7 +39,7 @@ source_set("util") { configs += [ "../build:allow_build_from_embedder" ] } -source_set("util_unittests") { +source_set("unittests") { testonly = true sources = [ |