| 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("//services/catalog/public/tools/catalog.gni") | 6 import("//services/catalog/public/tools/catalog.gni") |
| 6 import("//services/service_manager/public/service_manifest.gni") | 7 import("//services/service_manager/public/service_manifest.gni") |
| 7 | 8 |
| 8 source_set("mash") { | 9 source_set("mash") { |
| 9 sources = [ | 10 sources = [ |
| 10 "mash_runner.cc", | 11 "mash_runner.cc", |
| 11 "mash_runner.h", | 12 "mash_runner.h", |
| 12 ] | 13 ] |
| 13 deps = [ | 14 deps = [ |
| 14 ":chrome_mash_catalog", | 15 ":chrome_mash_catalog", |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 63 "//services/ui/ime/test_ime_driver:manifest", | 64 "//services/ui/ime/test_ime_driver:manifest", |
| 64 ] | 65 ] |
| 65 | 66 |
| 66 if (is_chromeos) { | 67 if (is_chromeos) { |
| 67 packaged_services += [ "//ash/mus:manifest" ] | 68 packaged_services += [ "//ash/mus:manifest" ] |
| 68 } | 69 } |
| 69 | 70 |
| 70 if (is_linux && !is_android) { | 71 if (is_linux && !is_android) { |
| 71 packaged_services += [ "//components/font_service:manifest" ] | 72 packaged_services += [ "//components/font_service:manifest" ] |
| 72 } | 73 } |
| 74 |
| 75 if (enable_nacl) { |
| 76 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] |
| 77 if (is_win && target_cpu == "x86") { |
| 78 packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ] |
| 79 } |
| 80 } |
| 73 } | 81 } |
| 74 | 82 |
| 75 catalog("catalog") { | 83 catalog("catalog") { |
| 76 embedded_services = [ ":mash_manifest" ] | 84 embedded_services = [ ":mash_manifest" ] |
| 77 catalog_deps = [ "//chrome/app:catalog" ] | 85 catalog_deps = [ "//chrome/app:catalog" ] |
| 78 } | 86 } |
| 79 | 87 |
| 80 catalog_cpp_source("chrome_mash_catalog") { | 88 catalog_cpp_source("chrome_mash_catalog") { |
| 81 catalog = ":catalog" | 89 catalog = ":catalog" |
| 82 generated_function_name = "CreateChromeMashCatalog" | 90 generated_function_name = "CreateChromeMashCatalog" |
| 83 } | 91 } |
| OLD | NEW |