diff options
author | slan <slan@chromium.org> | 2015-11-03 17:15:01 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-04 01:16:01 +0000 |
commit | ce9d62f0b57ea06a5b9995c5b8e4d894c99c3ac8 (patch) | |
tree | 181fcc8867c9373fdd6fccda79806049f1d2155c | |
parent | dfa5d4bc123d857e1d2917f1d3a2eb2a7af6320e (diff) | |
download | chromium_src-ce9d62f0b57ea06a5b9995c5b8e4d894c99c3ac8.zip chromium_src-ce9d62f0b57ea06a5b9995c5b8e4d894c99c3ac8.tar.gz chromium_src-ce9d62f0b57ea06a5b9995c5b8e4d894c99c3ac8.tar.bz2 |
[Chromecast] Add cast_shell to src/BUILD.gn and exclude unneeded deps.
This change adds cast_shell to the top-level BUILD.gn file and excludes GN targets that are not relevant to chromecast builds when is_chromecast_=true.
It also selectively includes //pdf when enable_pdf is true.
BUG=
Review URL: https://codereview.chromium.org/1423413002
Cr-Commit-Position: refs/heads/master@{#357700}
-rw-r--r-- | BUILD.gn | 9 | ||||
-rw-r--r-- | build/gn_migration.gypi | 5 | ||||
-rw-r--r-- | chrome/BUILD.gn | 6 | ||||
-rw-r--r-- | chrome/test/BUILD.gn | 2 |
4 files changed, 15 insertions, 7 deletions
@@ -79,7 +79,7 @@ group("both_gn_and_gyp") { "//url:url_unittests", ] - if (!is_ios && !is_android) { + if (!is_ios && !is_android && !is_chromecast) { deps += [ "//chrome", "//chrome/test:browser_tests", @@ -542,6 +542,9 @@ group("both_gn_and_gyp") { "//media/cast:cast_unittests", ] } + if (is_chromecast) { + deps += [ "//chromecast:cast_shell" ] + } } group("gn_only") { @@ -549,7 +552,7 @@ group("gn_only") { deps = [] - if (!is_ios) { + if (!is_ios && !is_chromecast) { deps += [ "//mandoline:all" ] } @@ -561,7 +564,7 @@ group("gn_only") { deps += [ "//components/mus/example:all" ] } - if (is_linux && !is_chromeos) { + if (is_linux && !is_chromeos && !is_chromecast) { # TODO(GYP): Figure out if any of these should be in gn_all # and figure out how cross-platform they are deps += [ diff --git a/build/gn_migration.gypi b/build/gn_migration.gypi index 24281ea..c0f55d2 100644 --- a/build/gn_migration.gypi +++ b/build/gn_migration.gypi @@ -520,6 +520,11 @@ '../win8/win8.gyp:metro_viewer', ], }], + ['chromecast==1', { + 'dependencies': [ + '../chromecast/chromecast.gyp:cast_shell', + ] + }] ], }, { diff --git a/chrome/BUILD.gn b/chrome/BUILD.gn index fae65fe..a7473e6 100644 --- a/chrome/BUILD.gn +++ b/chrome/BUILD.gn @@ -185,7 +185,7 @@ if (!is_android) { "//chrome/installer/util", "//content/public/app:both", ] - if (enable_plugins) { + if (enable_plugins && enable_pdf) { deps += [ "//pdf" ] } @@ -370,7 +370,7 @@ if (is_mac || is_win) { ] } - if (enable_plugins && !is_multi_dll_chrome) { + if (enable_plugins && enable_pdf && !is_multi_dll_chrome) { deps += [ "//pdf" ] } } @@ -423,7 +423,7 @@ if (is_mac || is_win) { # }, # }], } - if (enable_plugins) { + if (enable_plugins && enable_pdf) { deps += [ "//pdf" ] } } diff --git a/chrome/test/BUILD.gn b/chrome/test/BUILD.gn index 144a67c..a795e12 100644 --- a/chrome/test/BUILD.gn +++ b/chrome/test/BUILD.gn @@ -217,7 +217,7 @@ source_set("test_support") { ] } - if (enable_plugins) { + if (enable_plugins && enable_pdf) { deps += [ "//pdf" ] } |