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 59 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
70 if (enable_nacl) { | 70 if (enable_nacl) { |
71 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] | 71 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] |
72 if (is_win && target_cpu == "x86") { | 72 if (is_win && target_cpu == "x86") { |
73 packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ] | 73 packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ] |
74 } | 74 } |
75 } | 75 } |
76 } | 76 } |
77 | 77 |
78 catalog("catalog") { | 78 catalog("catalog") { |
79 embedded_services = [ ":mash_manifest" ] | 79 embedded_services = [ ":mash_manifest" ] |
80 catalog_deps = [ "//chrome/app:catalog" ] | 80 catalog_deps = [ "//chrome/app:catalog_for_mash" ] |
81 standalone_services = [ "//mash/example/views_examples:manifest" ] | 81 standalone_services = [ "//mash/example/views_examples:manifest" ] |
82 } | 82 } |
83 | 83 |
84 catalog_cpp_source("chrome_mash_catalog") { | 84 catalog_cpp_source("chrome_mash_catalog") { |
85 catalog = ":catalog" | 85 catalog = ":catalog" |
86 generated_function_name = "CreateChromeMashCatalog" | 86 generated_function_name = "CreateChromeMashCatalog" |
87 } | 87 } |
88 | 88 |
89 source_set("mash_service_overrides") { | 89 source_set("mash_service_overrides") { |
90 testonly = true | 90 testonly = true |
91 data = [ | 91 data = [ |
92 "mash_service_overrides.json", | 92 "mash_service_overrides.json", |
93 ] | 93 ] |
94 } | 94 } |
OLD | NEW |