summaryrefslogtreecommitdiffstats
path: root/chromecast
diff options
context:
space:
mode:
authorslan <slan@chromium.org>2015-09-10 12:40:33 -0700
committerCommit bot <commit-bot@chromium.org>2015-09-10 19:41:21 +0000
commit9ccf35998a5ce796c45f38d499605b97ec674529 (patch)
tree69a2feb8e55fc24526dde19521c6486e48ab2b6c /chromecast
parent0266f40e73c10c35d47f7f7784a6e0599065593a (diff)
downloadchromium_src-9ccf35998a5ce796c45f38d499605b97ec674529.zip
chromium_src-9ccf35998a5ce796c45f38d499605b97ec674529.tar.gz
chromium_src-9ccf35998a5ce796c45f38d499605b97ec674529.tar.bz2
Add the proper dependencies for an internal build of cast_shell.
This includes adding cast_shell_internal and cleaning up some TODOs. BUG=516899 Review URL: https://codereview.chromium.org/1330353005 Cr-Commit-Position: refs/heads/master@{#348215}
Diffstat (limited to 'chromecast')
-rw-r--r--chromecast/BUILD.gn36
-rw-r--r--chromecast/media/base/BUILD.gn10
-rw-r--r--chromecast/public/BUILD.gn6
3 files changed, 34 insertions, 18 deletions
diff --git a/chromecast/BUILD.gn b/chromecast/BUILD.gn
index 1862bf1..f5712fe 100644
--- a/chromecast/BUILD.gn
+++ b/chromecast/BUILD.gn
@@ -9,6 +9,11 @@ import("//testing/test.gni")
import("//tools/grit/repack.gni")
import("//ui/ozone/ozone.gni")
+declare_args() {
+ # TODO(slan): This most likely needs to be moved into a .gni file.
+ 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") {
@@ -74,6 +79,10 @@ executable("cast_shell") {
"//content/public/app:both",
]
+ if (chromecast_branding != "public") {
+ deps += [ "//chromecast/internal:cast_shell_internal" ]
+ }
+
if (ozone_platform_egltest) {
deps += [ "//ui/ozone/platform/egltest:eglplatform_shim_x11" ]
}
@@ -94,12 +103,6 @@ repack("cast_shell_pak") {
"$root_gen_dir/ui/strings/ui_strings_en-US.pak",
]
- if (chromecast_branding != "public" && use_chromecast_webui) {
- sources += [
- # TODO(slan): Update these paths to be accurate for internal builds.
- ]
- }
-
output = "$root_out_dir/assets/cast_shell.pak"
deps = [
@@ -114,9 +117,22 @@ repack("cast_shell_pak") {
"//ui/strings",
]
- if (chromecast_branding != "public" && use_chromecast_webui) {
- deps += [
- # TODO(slan): Update these paths to be accurate for internal builds.
- ]
+ if (chromecast_branding != "public") {
+ sources +=
+ [ "$root_gen_dir/chromecast/internal/shell/app/sound_resources.pak" ]
+
+ deps += [ "//chromecast/internal/shell/app:chromecast_sound_resources" ]
+
+ if (use_chromecast_webui) {
+ sources += [
+ "$root_gen_dir/chromecast/internal/webui/app_resources.pak",
+ "$root_gen_dir/chromecast/internal/webui/cast_webui_resources.pak",
+ ]
+
+ deps += [
+ "//chromecast/internal/webui:chromecast_app_resources",
+ "//chromecast/internal/webui:chromecast_webui_resources",
+ ]
+ }
}
}
diff --git a/chromecast/media/base/BUILD.gn b/chromecast/media/base/BUILD.gn
index 4f22bca..b82d938 100644
--- a/chromecast/media/base/BUILD.gn
+++ b/chromecast/media/base/BUILD.gn
@@ -34,6 +34,7 @@ source_set("base") {
configs += [ "//chromecast:config" ]
deps = [
+ ":libcast_media_default",
"//base",
"//chromecast/public",
"//crypto",
@@ -43,15 +44,8 @@ source_set("base") {
"//third_party/widevine/cdm:version_h",
]
- if (chromecast_branding != "public") {
- deps += [
- "${libcast_media_target}",
- # TODO(gyp): add dependency on internal/chromecast_internal:media_base_internal
- ]
- } else {
+ if (chromecast_branding == "public") {
sources += [ "key_systems_common_simple.cc" ]
-
- deps += [ ":libcast_media_default" ]
}
}
diff --git a/chromecast/public/BUILD.gn b/chromecast/public/BUILD.gn
index 779c5fd..2b2a167 100644
--- a/chromecast/public/BUILD.gn
+++ b/chromecast/public/BUILD.gn
@@ -2,6 +2,10 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+config("public_config") {
+ include_dirs = [ "//chromecast/public" ]
+}
+
source_set("public") {
sources = [
"cast_egl_platform.h",
@@ -18,4 +22,6 @@ source_set("public") {
"task_runner.h",
"video_plane.h",
]
+
+ public_configs = [ ":public_config" ]
}