Chromium Code Reviews| Index: BUILD.gn |
| diff --git a/BUILD.gn b/BUILD.gn |
| index 9af027377bcc6a51d2a97895504c401eaee4b9ed..cc3f9c59da7f2ac761c111acc13ed487898ef579 100644 |
| --- a/BUILD.gn |
| +++ b/BUILD.gn |
| @@ -38,6 +38,8 @@ if (is_official_build) { |
| assert(!is_component_build) |
| } |
| +is_fuchsia = current_os == "fuchsia" |
|
jamesr
2017/02/17 00:47:35
ideally this would be in https://cs.chromium.org/c
scottmg
2017/02/17 00:50:45
Agreed, I wasn't sure what the general feeling was
|
| + |
| # This file defines the following five main targets: |
| # |
| # "both_gn_and_gyp" should list every root target (target that nothing else |
| @@ -79,7 +81,7 @@ group("gn_all") { |
| ":gn_visibility", |
| ] |
| - if (!is_ios) { |
| + if (!is_ios && !is_fuchsia) { |
| deps += [ "//v8:gn_all" ] |
| } |
| } |
| @@ -203,24 +205,29 @@ group("both_gn_and_gyp") { |
| deps = [ |
| "//base:base_unittests", |
| "//chrome/installer", |
| - "//components:components_unittests", |
| "//net:net_unittests", |
| - "//skia:skia_unittests", |
| "//sql:sql_unittests", |
| "//tools/ipc_fuzzer:ipc_fuzzer_all", |
| - "//ui/base:ui_base_unittests", |
| - "//ui/gfx:gfx_unittests", |
| "//url:url_unittests", |
| ] |
| - if (!is_android && !is_chromecast) { |
| + if (!is_fuchsia) { |
| + deps += [ |
| + "//components:components_unittests", |
| + "//skia:skia_unittests", |
| + "//ui/base:ui_base_unittests", |
| + "//ui/gfx:gfx_unittests", |
| + ] |
| + } |
| + |
| + if (!is_android && !is_chromecast && !is_fuchsia) { |
| deps += [ |
| "//crypto:crypto_unittests", |
| "//google_apis/gcm:gcm_unit_tests", |
| ] |
| } |
| - if (!is_ios && !is_android && !is_chromecast) { |
| + if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { |
| deps += [ |
| "//chrome", |
| "//chrome/test:browser_tests", |
| @@ -279,7 +286,7 @@ group("both_gn_and_gyp") { |
| ] |
| } |
| - if (!is_ios) { |
| + if (!is_ios && !is_fuchsia) { |
| # TODO(GYP): Figure out which of these should actually build on iOS, |
| # and whether there should be other targets that are iOS-only and missing. |
| deps += [ |
| @@ -323,8 +330,10 @@ group("both_gn_and_gyp") { |
| "//ui/touch_selection:ui_touch_selection_unittests", |
| "//url/ipc:url_ipc_unittests", |
| ] |
| - } else { |
| + } else if (is_ios) { |
| deps += [ "//ios:all" ] |
| + } else if (is_fuchsia) { |
| + deps += [ "//fuchsia" ] |
| } |
| deps += root_extra_deps |
| @@ -522,8 +531,8 @@ group("both_gn_and_gyp") { |
| } |
| # TODO(GYP): Figure out which of these should (and can) build |
| - # for chromeos/ios. |
| - if (!is_chromeos && !is_ios) { |
| + # for chromeos/ios/fuchsia. |
| + if (!is_chromeos && !is_ios && !is_fuchsia) { |
| deps += [ |
| "//base:build_utf8_validator_tables", |
| "//base:check_example", |
| @@ -685,7 +694,7 @@ group("both_gn_and_gyp") { |
| deps += |
| [ "//chrome/installer/mini_installer:next_version_mini_installer" ] |
| } |
| - } else if (!is_android && !is_ios) { |
| + } else if (!is_android && !is_ios && !is_fuchsia) { |
| deps += [ "//breakpad:symupload($host_toolchain)" ] |
| } |
| @@ -714,18 +723,18 @@ group("gn_only") { |
| deps = [] |
| - if (!is_ios) { |
| + if (!is_ios && !is_fuchsia) { |
| deps += [ |
| "//media/mojo:media_mojo_unittests", |
| "//services:service_unittests", |
| ] |
| } |
| - if (!is_android && !is_ios) { |
| + if (!is_android && !is_ios && !is_fuchsia) { |
| deps += [ "//content/browser/bluetooth/tools:bluetooth_metrics_hash" ] |
| } |
| - if (!is_android && !is_ios && !is_chromeos) { |
| + if (!is_android && !is_ios && !is_chromeos && !is_fuchsia) { |
| deps += [ "//components/proximity_auth:proximity_auth_unittests" ] |
| } |
| @@ -878,7 +887,7 @@ group("gn_visibility") { |
| # "//third_party/pdfium:pdfium_unittests", # TODO(GYP): visibility? |
| ] |
| - if (!is_ios) { |
| + if (!is_ios && !is_fuchsia) { |
| deps += [ |
| "//v8:postmortem-metadata", |
| "//v8:v8_snapshot", |
| @@ -886,7 +895,7 @@ group("gn_visibility") { |
| } |
| } |
| -if (!is_ios) { |
| +if (!is_ios && !is_fuchsia) { |
| # This group includes all of the targets needed to build and test Blink, |
| # including running the layout tests (see below). |
| group("blink_tests") { |
| @@ -962,7 +971,7 @@ group("chromium_swarm_tests") { |
| group("chromium_builder_perf") { |
| testonly = true |
| - if (!is_ios && !is_android && !is_chromecast) { |
| + if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { |
| data_deps = [ |
| "//cc:cc_perftests", |
| "//chrome/test:load_library_perf_tests", |
| @@ -998,7 +1007,7 @@ group("chromium_builder_perf") { |
| } |
| } |
| -if (!is_ios && !is_android && !is_chromecast) { |
| +if (!is_ios && !is_android && !is_chromecast && !is_fuchsia) { |
| group("chromium_builder_asan") { |
| testonly = true |