From cbf8daad50ce2889c58f488b9b4d1702118caebc Mon Sep 17 00:00:00 2001 From: Jordan Bayles Date: Tue, 19 Nov 2019 13:06:55 -0800 Subject: Move protos to their own BUILD.gn files Currently, one of the Windows bots is trying to build platform/ and util/, because it is building all targets that gn knows about, including ones that are not listed as dependencies, not necessary for any top level targets, and do not compile on that operating system. This patch moves protos to their own BUILD.gn files, in an attempt to keep the Windows bot from discovering unbuildable targets. Change-Id: I8936812017d8b2fcf82fa922a68a93c645093f2f Reviewed-on: https://chromium-review.googlesource.com/c/openscreen/+/1925024 Reviewed-by: mark a. foltz Commit-Queue: Jordan Bayles --- cast/common/BUILD.gn | 28 ++++------------------------ cast/common/certificate/proto/BUILD.gn | 19 +++++++++++++++++++ cast/common/channel/proto/BUILD.gn | 13 +++++++++++++ cast/sender/BUILD.gn | 8 ++++---- 4 files changed, 40 insertions(+), 28 deletions(-) create mode 100644 cast/common/certificate/proto/BUILD.gn create mode 100644 cast/common/channel/proto/BUILD.gn (limited to 'cast') diff --git a/cast/common/BUILD.gn b/cast/common/BUILD.gn index a5c04ec5..11511415 100644 --- a/cast/common/BUILD.gn +++ b/cast/common/BUILD.gn @@ -21,16 +21,10 @@ source_set("certificate") { ] deps = [ - ":certificate_proto", "../../platform", "../../third_party/abseil", "../../util", - ] -} - -proto_library("certificate_proto") { - sources = [ - "certificate/proto/revocation.proto", + "certificate/proto:certificate_proto", ] } @@ -44,9 +38,9 @@ source_set("channel") { ] deps = [ - ":certificate_proto", - ":channel_proto", "../../util", + "certificate/proto:certificate_proto", + "channel/proto:channel_proto", ] public_deps = [ @@ -55,13 +49,6 @@ source_set("channel") { ] } -proto_library("channel_proto") { - sources = [ - "channel/proto/authority_keys.proto", - "channel/proto/cast_channel.proto", - ] -} - source_set("unittests") { testonly = true sources = [ @@ -75,19 +62,12 @@ source_set("unittests") { 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", + "certificate/proto:certificate_unittest_proto", ] } diff --git a/cast/common/certificate/proto/BUILD.gn b/cast/common/certificate/proto/BUILD.gn new file mode 100644 index 00000000..d171715d --- /dev/null +++ b/cast/common/certificate/proto/BUILD.gn @@ -0,0 +1,19 @@ +# 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") + +proto_library("certificate_proto") { + sources = [ + "revocation.proto", + ] +} + +proto_library("certificate_unittest_proto") { + testonly = true + sources = [ + "test_suite.proto", + ] +} diff --git a/cast/common/channel/proto/BUILD.gn b/cast/common/channel/proto/BUILD.gn new file mode 100644 index 00000000..13ee38af --- /dev/null +++ b/cast/common/channel/proto/BUILD.gn @@ -0,0 +1,13 @@ +# 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") + +proto_library("channel_proto") { + sources = [ + "authority_keys.proto", + "cast_channel.proto", + ] +} diff --git a/cast/sender/BUILD.gn b/cast/sender/BUILD.gn index 05932260..86d67ade 100644 --- a/cast/sender/BUILD.gn +++ b/cast/sender/BUILD.gn @@ -13,8 +13,8 @@ source_set("channel") { ] deps = [ - "../common:certificate_proto", - "../common:channel_proto", + "../common/certificate/proto:certificate_proto", + "../common/channel/proto:channel_proto", ] public_deps = [ @@ -32,7 +32,7 @@ source_set("unittests") { ":channel", "../../platform", "../../third_party/googletest:gtest", - "../common:certificate_proto", - "../common:certificate_unittest_proto", + "../common/certificate/proto:certificate_proto", + "../common/certificate/proto:certificate_unittest_proto", ] } -- cgit v1.2.3