Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright 2016 The Chromium Authors. All rights reserved. | 1 # Copyright 2016 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/nacl/config.gni") | 5 import("//build/config/nacl/config.gni") |
| 6 import("//chrome/common/features.gni") | 6 import("//chrome/common/features.gni") |
| 7 import("//services/catalog/public/tools/catalog.gni") | 7 import("//services/catalog/public/tools/catalog.gni") |
| 8 import("//services/service_manager/public/service_manifest.gni") | 8 import("//services/service_manager/public/service_manifest.gni") |
| 9 | 9 |
| 10 assert(enable_package_mash_services) | 10 assert(enable_package_mash_services) |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 82 "//mash/simple_wm:manifest", | 82 "//mash/simple_wm:manifest", |
| 83 ] | 83 ] |
| 84 | 84 |
| 85 if (is_chromeos) { | 85 if (is_chromeos) { |
| 86 embedded_services += [ "//ash/mus:manifest" ] | 86 embedded_services += [ "//ash/mus:manifest" ] |
| 87 } | 87 } |
| 88 | 88 |
| 89 if (is_linux && !is_android) { | 89 if (is_linux && !is_android) { |
| 90 embedded_services += [ "//components/font_service:manifest" ] | 90 embedded_services += [ "//components/font_service:manifest" ] |
| 91 } | 91 } |
| 92 | |
| 93 if (enable_nacl) { | |
|
sky
2017/05/08 15:59:31
Should this only happen for chromeos? e.g.:
if (e
Hadi
2017/05/08 18:05:05
Done.
| |
| 94 embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ] | |
| 95 } | |
| 92 } | 96 } |
| 93 | 97 |
| 94 catalog_cpp_source("chrome_mash_catalog") { | 98 catalog_cpp_source("chrome_mash_catalog") { |
| 95 catalog = ":catalog" | 99 catalog = ":catalog" |
| 96 generated_function_name = "CreateChromeMashCatalog" | 100 generated_function_name = "CreateChromeMashCatalog" |
| 97 } | 101 } |
| 98 | 102 |
| 99 if (is_chromeos) { | 103 if (is_chromeos) { |
| 100 catalog("catalog_mus") { | 104 catalog("catalog_mus") { |
| 101 catalog_deps = [ "//chrome/app:catalog" ] | 105 catalog_deps = [ "//chrome/app:catalog" ] |
| 102 embedded_services = [ | 106 embedded_services = [ |
| 103 "//services/ui:manifest", | 107 "//services/ui:manifest", |
| 104 | 108 |
| 105 # TODO(sky): verify if we need this. | 109 # TODO(sky): verify if we need this. |
| 106 "//services/ui/ime/test_ime_driver:manifest", | 110 "//services/ui/ime/test_ime_driver:manifest", |
| 107 ] | 111 ] |
| 108 | 112 |
| 109 if (enable_nacl) { | 113 if (enable_nacl) { |
| 110 embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ] | 114 embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ] |
| 111 } | 115 } |
| 112 } | 116 } |
| 113 | 117 |
| 114 catalog_cpp_source("chrome_mus_catalog") { | 118 catalog_cpp_source("chrome_mus_catalog") { |
| 115 catalog = ":catalog_mus" | 119 catalog = ":catalog_mus" |
| 116 generated_function_name = "CreateChromeMusCatalog" | 120 generated_function_name = "CreateChromeMusCatalog" |
| 117 } | 121 } |
| 118 } | 122 } |
| OLD | NEW |