diff options
author | slan <slan@chromium.org> | 2015-10-30 16:51:13 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-10-30 23:52:35 +0000 |
commit | e48522e69fae4ededa0e66df5e561f0a121cf256 (patch) | |
tree | b4c3b155c1f8ddfcdcd11e5734371933e8ee57cc | |
parent | 0caad0dd8276ffaeb3fa3bd2b738f0a1a1c8cdc7 (diff) | |
download | chromium_src-e48522e69fae4ededa0e66df5e561f0a121cf256.zip chromium_src-e48522e69fae4ededa0e66df5e561f0a121cf256.tar.gz chromium_src-e48522e69fae4ededa0e66df5e561f0a121cf256.tar.bz2 |
[Chromecast] Clean up GN so that gn check passes.
gn check will be automated via the CQ. Update dependencies to make gn
check pass upstream. This change makes //chromecast/media:media a
meta-target to prevent long deps lists of individual targets.
BUG=
Review URL: https://codereview.chromium.org/1427993002
Cr-Commit-Position: refs/heads/master@{#357231}
-rw-r--r-- | chromecast/base/cast_sys_info_dummy.h | 4 | ||||
-rw-r--r-- | chromecast/browser/BUILD.gn | 1 | ||||
-rw-r--r-- | chromecast/media/BUILD.gn | 4 | ||||
-rw-r--r-- | chromecast/media/audio/BUILD.gn | 24 | ||||
-rw-r--r-- | chromecast/media/cma/BUILD.gn | 3 | ||||
-rw-r--r-- | chromecast/renderer/media/BUILD.gn | 3 |
6 files changed, 17 insertions, 22 deletions
diff --git a/chromecast/base/cast_sys_info_dummy.h b/chromecast/base/cast_sys_info_dummy.h index 89a8b8b..ec6c0ea 100644 --- a/chromecast/base/cast_sys_info_dummy.h +++ b/chromecast/base/cast_sys_info_dummy.h @@ -5,7 +5,9 @@ #ifndef CHROMECAST_BASE_CAST_SYS_INFO_DUMMY_H_ #define CHROMECAST_BASE_CAST_SYS_INFO_DUMMY_H_ -#include "base/macros.h" +// Note(slan): This file is needed by internal targets which cannot depend on +// "//base". Amend this include with a comment so gn check ignores it. +#include "base/macros.h" // nogncheck #include "chromecast/public/cast_sys_info.h" namespace chromecast { diff --git a/chromecast/browser/BUILD.gn b/chromecast/browser/BUILD.gn index 4453f8a..1223add 100644 --- a/chromecast/browser/BUILD.gn +++ b/chromecast/browser/BUILD.gn @@ -91,6 +91,7 @@ source_set("browser") { "//content/public/browser", "//content/public/common", "//content/public/utility", + "//gpu", "//media", "//ipc", "//net", diff --git a/chromecast/media/BUILD.gn b/chromecast/media/BUILD.gn index f12385b..5144799 100644 --- a/chromecast/media/BUILD.gn +++ b/chromecast/media/BUILD.gn @@ -6,7 +6,7 @@ import("//chromecast/chromecast.gni") import("//testing/test.gni") group("media") { - deps = [ + public_deps = [ "//chromecast/media/audio", "//chromecast/media/base", "//chromecast/media/cdm", @@ -40,7 +40,7 @@ test("cast_media_unittests") { deps = [ ":media", - "//chromecast/media/audio:test_support", + "//chromecast/media/audio", "//chromecast/media/base:message_loop", "//chromecast/media/cma/backend", "//chromecast/media/cma/base", diff --git a/chromecast/media/audio/BUILD.gn b/chromecast/media/audio/BUILD.gn index 5d87fa3..3066fa4 100644 --- a/chromecast/media/audio/BUILD.gn +++ b/chromecast/media/audio/BUILD.gn @@ -14,25 +14,13 @@ source_set("audio") { configs += [ "//chromecast:config" ] - public_deps = [ - "//chromecast/public/media", - ] - deps = [ + "//base", + "//chromecast/base", + "//chromecast/media/base", + "//chromecast/media/cma/base", + "//chromecast/public/media", "//media", - ] -} - -source_set("test_support") { - testonly = true - - configs += [ "//chromecast:config" ] - - public_deps = [ - ":audio", - ] - - deps = [ - "//testing/gtest", + "//media:shared_memory_support", ] } diff --git a/chromecast/media/cma/BUILD.gn b/chromecast/media/cma/BUILD.gn index b4b1f6d..5c76f12 100644 --- a/chromecast/media/cma/BUILD.gn +++ b/chromecast/media/cma/BUILD.gn @@ -2,8 +2,9 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. +# Targets may depend on this to bring in every CMA component. group("cma") { - deps = [ + public_deps = [ "//chromecast/media/cma/backend", "//chromecast/media/cma/base", "//chromecast/media/cma/ipc", diff --git a/chromecast/renderer/media/BUILD.gn b/chromecast/renderer/media/BUILD.gn index 38efe6a..0e127f3 100644 --- a/chromecast/renderer/media/BUILD.gn +++ b/chromecast/renderer/media/BUILD.gn @@ -33,8 +33,11 @@ source_set("media") { "//chromecast/common/media", "//chromecast/media", "//content/public/renderer", + "//gpu/command_buffer/client:gles2_interface", + "//gpu/command_buffer/common", "//ipc", "//media", + "//ui/gfx/geometry", ] } |