| 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 66 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 77 if (enable_nacl) { | 77 if (enable_nacl) { |
| 78 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] | 78 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] |
| 79 if (is_win && target_cpu == "x86") { | 79 if (is_win && target_cpu == "x86") { |
| 80 packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ] | 80 packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ] |
| 81 } | 81 } |
| 82 } | 82 } |
| 83 } | 83 } |
| 84 | 84 |
| 85 catalog("catalog") { | 85 catalog("catalog") { |
| 86 embedded_services = [ ":mash_manifest" ] | 86 embedded_services = [ ":mash_manifest" ] |
| 87 catalog_deps = [ "//chrome/app:catalog_for_mus" ] | 87 catalog_deps = [ "//chrome/app:catalog_for_mash" ] |
| 88 standalone_services = [ | 88 standalone_services = [ |
| 89 "//mash/example/views_examples:manifest", | 89 "//mash/example/views_examples:manifest", |
| 90 "//mash/simple_wm:manifest", | 90 "//mash/simple_wm:manifest", |
| 91 ] | 91 ] |
| 92 } | 92 } |
| 93 | 93 |
| 94 catalog_cpp_source("chrome_mash_catalog") { | 94 catalog_cpp_source("chrome_mash_catalog") { |
| 95 catalog = ":catalog" | 95 catalog = ":catalog" |
| 96 generated_function_name = "CreateChromeMashCatalog" | 96 generated_function_name = "CreateChromeMashCatalog" |
| 97 } | 97 } |
| (...skipping 16 matching lines...) Expand all Loading... |
| 114 "//services/ui/ime/test_ime_driver:manifest", | 114 "//services/ui/ime/test_ime_driver:manifest", |
| 115 ] | 115 ] |
| 116 | 116 |
| 117 if (enable_nacl) { | 117 if (enable_nacl) { |
| 118 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] | 118 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] |
| 119 } | 119 } |
| 120 } | 120 } |
| 121 | 121 |
| 122 catalog("catalog_mus") { | 122 catalog("catalog_mus") { |
| 123 embedded_services = [ ":mus_manifest" ] | 123 embedded_services = [ ":mus_manifest" ] |
| 124 catalog_deps = [ "//chrome/app:catalog_for_mus" ] | 124 catalog_deps = [ "//chrome/app:catalog" ] |
| 125 } | 125 } |
| 126 | 126 |
| 127 catalog_cpp_source("chrome_mus_catalog") { | 127 catalog_cpp_source("chrome_mus_catalog") { |
| 128 catalog = ":catalog_mus" | 128 catalog = ":catalog_mus" |
| 129 generated_function_name = "CreateChromeMusCatalog" | 129 generated_function_name = "CreateChromeMusCatalog" |
| 130 } | 130 } |
| 131 } | 131 } |
| OLD | NEW |