summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorslan <slan@chromium.org>2015-11-13 14:53:58 -0800
committerCommit bot <commit-bot@chromium.org>2015-11-13 22:54:54 +0000
commit62afce4428feedbf7fc75690b4034900447210b0 (patch)
treef682b8a1bc02e726b63dca241b43ef8290ac24a2
parent62b96626799d935ec467c5104f2da5b8ce080592 (diff)
downloadchromium_src-62afce4428feedbf7fc75690b4034900447210b0.zip
chromium_src-62afce4428feedbf7fc75690b4034900447210b0.tar.gz
chromium_src-62afce4428feedbf7fc75690b4034900447210b0.tar.bz2
[GN][Chromecast] Replace //chromecast:config with feature-specific configs.
This config target is not good style - it has remained in the build since the very first attempt to port chromecast to GN. Remove it now, and replace it with feature-specific configs. In this case, playready_config has been added to all relevant targets. BUG=516899 Review URL: https://codereview.chromium.org/1435413002 Cr-Commit-Position: refs/heads/master@{#359678}
-rw-r--r--chromecast/BUILD.gn19
-rw-r--r--chromecast/app/BUILD.gn2
-rw-r--r--chromecast/base/BUILD.gn2
-rw-r--r--chromecast/base/metrics/BUILD.gn4
-rw-r--r--chromecast/browser/media/BUILD.gn4
-rw-r--r--chromecast/crash/BUILD.gn2
-rw-r--r--chromecast/crypto/BUILD.gn2
-rw-r--r--chromecast/media/BUILD.gn2
-rw-r--r--chromecast/media/audio/BUILD.gn2
-rw-r--r--chromecast/media/base/BUILD.gn12
-rw-r--r--chromecast/media/cdm/BUILD.gn14
-rw-r--r--chromecast/media/cma/backend/BUILD.gn2
-rw-r--r--chromecast/media/cma/base/BUILD.gn2
-rw-r--r--chromecast/media/cma/ipc/BUILD.gn2
-rw-r--r--chromecast/media/cma/ipc_streamer/BUILD.gn2
-rw-r--r--chromecast/media/cma/pipeline/BUILD.gn2
-rw-r--r--chromecast/renderer/BUILD.gn4
17 files changed, 27 insertions, 52 deletions
diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn
index 6ac1963..22b0a56 100644
--- a/chromecast/BUILD.gn
+++ b/chromecast/BUILD.gn
@@ -15,25 +15,12 @@ declare_args() {
use_chromecast_webui = true
}
-# TODO(slan): This target is being used far too broadly. We should reduce the
-# uses of this config to targets that actually need it. (b/23814594)
-config("config") {
- defines = []
-
- if (use_playready) {
- defines += [ "PLAYREADY_CDM_AVAILABLE" ]
+if (use_playready) {
+ config("playready_config") {
+ defines = [ "PLAYREADY_CDM_AVAILABLE" ]
}
}
-component("chromecast") {
- deps = [
- "//chromecast/base",
- "//chromecast/base/metrics",
- "//chromecast/crash",
- "//chromecast/media",
- ]
-}
-
# A list of all public test() binaries. This is an organizational target that
# cannot be depended upon or built directly. Build cast_group_test_list instead.
cast_test_group("cast_tests") {
diff --git a/chromecast/app/BUILD.gn b/chromecast/app/BUILD.gn
index c3746d4..ba591b6 100644
--- a/chromecast/app/BUILD.gn
+++ b/chromecast/app/BUILD.gn
@@ -34,8 +34,6 @@ source_set("cast_crash_client") {
"linux/cast_crash_reporter_client.h",
]
- configs += [ "//chromecast:config" ]
-
deps = [
"//base",
"//chromecast/base",
diff --git a/chromecast/base/BUILD.gn b/chromecast/base/BUILD.gn
index 0cc4755..7ec6e60 100644
--- a/chromecast/base/BUILD.gn
+++ b/chromecast/base/BUILD.gn
@@ -37,8 +37,6 @@ source_set("base") {
"task_runner_impl.h",
]
- configs += [ "//chromecast:config" ]
-
public_deps = [
"//chromecast/base/metrics",
"//chromecast/public",
diff --git a/chromecast/base/metrics/BUILD.gn b/chromecast/base/metrics/BUILD.gn
index 191b304..a9556a5 100644
--- a/chromecast/base/metrics/BUILD.gn
+++ b/chromecast/base/metrics/BUILD.gn
@@ -11,8 +11,6 @@ source_set("metrics") {
"grouped_histogram.h",
]
- configs += [ "//chromecast:config" ]
-
deps = [
"//base",
]
@@ -33,6 +31,4 @@ source_set("test_support") {
deps = [
"//base",
]
-
- configs += [ "//chromecast:config" ]
}
diff --git a/chromecast/browser/media/BUILD.gn b/chromecast/browser/media/BUILD.gn
index a562540..a643e3a 100644
--- a/chromecast/browser/media/BUILD.gn
+++ b/chromecast/browser/media/BUILD.gn
@@ -18,6 +18,10 @@ source_set("media") {
"media_pipeline_host.h",
]
+ if (use_playready) {
+ public_configs = [ "//chromecast:playready_config" ]
+ }
+
deps = [
"//base",
"//chromecast/base",
diff --git a/chromecast/crash/BUILD.gn b/chromecast/crash/BUILD.gn
index 28fb28b..ce4b31e 100644
--- a/chromecast/crash/BUILD.gn
+++ b/chromecast/crash/BUILD.gn
@@ -27,8 +27,6 @@ source_set("crash") {
"linux/synchronized_minidump_manager.h",
]
- configs += [ "//chromecast:config" ]
-
deps = [
"//base",
"//breakpad:client",
diff --git a/chromecast/crypto/BUILD.gn b/chromecast/crypto/BUILD.gn
index 8964b4d..d7ff30d 100644
--- a/chromecast/crypto/BUILD.gn
+++ b/chromecast/crypto/BUILD.gn
@@ -11,8 +11,6 @@ source_set("crypto") {
"signature_cache.h",
]
- configs += [ "//chromecast:config" ]
-
deps = [
"//base",
]
diff --git a/chromecast/media/BUILD.gn b/chromecast/media/BUILD.gn
index 5144799..b54ba7d 100644
--- a/chromecast/media/BUILD.gn
+++ b/chromecast/media/BUILD.gn
@@ -36,8 +36,6 @@ test("cast_media_unittests") {
"cma/test/run_all_unittests.cc",
]
- configs += [ "//chromecast:config" ]
-
deps = [
":media",
"//chromecast/media/audio",
diff --git a/chromecast/media/audio/BUILD.gn b/chromecast/media/audio/BUILD.gn
index 3066fa4..4aeeb38 100644
--- a/chromecast/media/audio/BUILD.gn
+++ b/chromecast/media/audio/BUILD.gn
@@ -12,8 +12,6 @@ source_set("audio") {
"cast_audio_output_stream.h",
]
- configs += [ "//chromecast:config" ]
-
deps = [
"//base",
"//chromecast/base",
diff --git a/chromecast/media/base/BUILD.gn b/chromecast/media/base/BUILD.gn
index b6d90b9..7d02a3a 100644
--- a/chromecast/media/base/BUILD.gn
+++ b/chromecast/media/base/BUILD.gn
@@ -16,8 +16,6 @@ source_set("message_loop") {
"//chromecast/public/media",
]
- configs += [ "//chromecast:config" ]
-
deps = [
"//base",
"//chromecast/media/base:libcast_media_1.0",
@@ -31,7 +29,9 @@ source_set("key_systems") {
"key_systems_common.h",
]
- configs += [ "//chromecast:config" ]
+ if (use_playready) {
+ public_configs = [ "//chromecast:playready_config" ]
+ }
deps = [
"//base",
@@ -62,8 +62,6 @@ source_set("base") {
"//chromecast/public/media",
]
- configs += [ "//chromecast:config" ]
-
deps = [
":libcast_media_1.0",
"//base",
@@ -100,8 +98,6 @@ source_set("libcast_media_1.0_default_core") {
"cast_media_default.cc",
]
- configs += [ "//chromecast:config" ]
-
public_deps = [
"//chromecast/public",
"//chromecast/public/media",
@@ -123,8 +119,6 @@ shared_library("libcast_media_1.0_default") {
"cast_media_default.cc",
]
- configs += [ "//chromecast:config" ]
-
public_deps = [
"//chromecast/public",
"//chromecast/public/media",
diff --git a/chromecast/media/cdm/BUILD.gn b/chromecast/media/cdm/BUILD.gn
index 1a929d0..cc9fa01 100644
--- a/chromecast/media/cdm/BUILD.gn
+++ b/chromecast/media/cdm/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("//chromecast/chromecast.gni")
+
+# GYP target: chromecast/media.gyp:media_cdm
source_set("cdm") {
sources = [
"browser_cdm_cast.cc",
"browser_cdm_cast.h",
+ "chromecast_init_data.cc",
+ "chromecast_init_data.h",
]
deps = [
@@ -14,5 +19,12 @@ source_set("cdm") {
"//media",
]
- configs += [ "//chromecast:config" ]
+ if (is_android && use_playready) {
+ sources += [
+ "playready_drm_delegate_android.cc",
+ "playready_drm_delegate_android.h",
+ ]
+
+ deps += [ "//media/base/android" ]
+ }
}
diff --git a/chromecast/media/cma/backend/BUILD.gn b/chromecast/media/cma/backend/BUILD.gn
index 4f30a05..fc72d02 100644
--- a/chromecast/media/cma/backend/BUILD.gn
+++ b/chromecast/media/cma/backend/BUILD.gn
@@ -20,6 +20,4 @@ source_set("backend") {
deps = [
"//base",
]
-
- configs += [ "//chromecast:config" ]
}
diff --git a/chromecast/media/cma/base/BUILD.gn b/chromecast/media/cma/base/BUILD.gn
index b0ebefd..2e4059c 100644
--- a/chromecast/media/cma/base/BUILD.gn
+++ b/chromecast/media/cma/base/BUILD.gn
@@ -30,8 +30,6 @@ source_set("base") {
"simple_media_task_runner.h",
]
- configs += [ "//chromecast:config" ]
-
public_deps = [
"//chromecast/public/media",
]
diff --git a/chromecast/media/cma/ipc/BUILD.gn b/chromecast/media/cma/ipc/BUILD.gn
index 85ed2ac..e70b184 100644
--- a/chromecast/media/cma/ipc/BUILD.gn
+++ b/chromecast/media/cma/ipc/BUILD.gn
@@ -13,8 +13,6 @@ source_set("ipc") {
"media_message_type.h",
]
- configs += [ "//chromecast:config" ]
-
deps = [
"//base",
"//chromecast/media/cma/base",
diff --git a/chromecast/media/cma/ipc_streamer/BUILD.gn b/chromecast/media/cma/ipc_streamer/BUILD.gn
index 380a965..a3429d6 100644
--- a/chromecast/media/cma/ipc_streamer/BUILD.gn
+++ b/chromecast/media/cma/ipc_streamer/BUILD.gn
@@ -18,8 +18,6 @@ source_set("ipc_streamer") {
"video_decoder_config_marshaller.h",
]
- configs += [ "//chromecast:config" ]
-
public_deps = [
"//chromecast/public/media",
]
diff --git a/chromecast/media/cma/pipeline/BUILD.gn b/chromecast/media/cma/pipeline/BUILD.gn
index 1bfbd84..c8581e6 100644
--- a/chromecast/media/cma/pipeline/BUILD.gn
+++ b/chromecast/media/cma/pipeline/BUILD.gn
@@ -39,6 +39,4 @@ source_set("pipeline") {
"//media",
"//third_party/boringssl",
]
-
- configs += [ "//chromecast:config" ]
}
diff --git a/chromecast/renderer/BUILD.gn b/chromecast/renderer/BUILD.gn
index cd7f240..940fc39 100644
--- a/chromecast/renderer/BUILD.gn
+++ b/chromecast/renderer/BUILD.gn
@@ -26,6 +26,10 @@ source_set("renderer") {
]
}
+ if (use_playready) {
+ configs += [ "//chromecast:playready_config" ]
+ }
+
deps = [
"//base",
"//chromecast/base",