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 104 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
115 | 115 |
116 catalog_cpp_source("chrome_test_catalog") { | 116 catalog_cpp_source("chrome_test_catalog") { |
117 catalog = ":catalog_test" | 117 catalog = ":catalog_test" |
118 generated_function_name = "CreateChromeTestCatalog" | 118 generated_function_name = "CreateChromeTestCatalog" |
119 } | 119 } |
120 | 120 |
121 if (is_chromeos) { | 121 if (is_chromeos) { |
122 catalog("catalog_mus") { | 122 catalog("catalog_mus") { |
123 catalog_deps = [ "//chrome/app:catalog" ] | 123 catalog_deps = [ "//chrome/app:catalog" ] |
124 embedded_services = [ | 124 embedded_services = [ |
125 "//services/ui:manifest", | |
126 | |
127 # TODO(sky): verify if we need this. | 125 # TODO(sky): verify if we need this. |
128 "//services/ui/ime/test_ime_driver:manifest", | 126 "//services/ui/ime/test_ime_driver:manifest", |
129 ] | 127 ] |
130 | 128 |
131 if (enable_nacl) { | 129 if (enable_nacl) { |
132 embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ] | 130 embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ] |
133 } | 131 } |
134 } | 132 } |
135 | 133 |
136 catalog_cpp_source("chrome_mus_catalog") { | 134 catalog_cpp_source("chrome_mus_catalog") { |
137 catalog = ":catalog_mus" | 135 catalog = ":catalog_mus" |
138 generated_function_name = "CreateChromeMusCatalog" | 136 generated_function_name = "CreateChromeMusCatalog" |
139 } | 137 } |
140 } | 138 } |
OLD | NEW |