| 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("//services/catalog/public/tools/catalog.gni") | 6 import("//services/catalog/public/tools/catalog.gni") |
| 7 import("//services/service_manager/public/service_manifest.gni") | 7 import("//services/service_manager/public/service_manifest.gni") |
| 8 | 8 |
| 9 source_set("mash") { | 9 source_set("mash") { |
| 10 sources = [ | 10 sources = [ |
| (...skipping 72 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 83 | 83 |
| 84 catalog("catalog") { | 84 catalog("catalog") { |
| 85 embedded_services = [ ":mash_manifest" ] | 85 embedded_services = [ ":mash_manifest" ] |
| 86 catalog_deps = [ "//chrome/app:catalog" ] | 86 catalog_deps = [ "//chrome/app:catalog" ] |
| 87 } | 87 } |
| 88 | 88 |
| 89 catalog_cpp_source("chrome_mash_catalog") { | 89 catalog_cpp_source("chrome_mash_catalog") { |
| 90 catalog = ":catalog" | 90 catalog = ":catalog" |
| 91 generated_function_name = "CreateChromeMashCatalog" | 91 generated_function_name = "CreateChromeMashCatalog" |
| 92 } | 92 } |
| 93 |
| 94 source_set("mash_service_overrides") { |
| 95 testonly = true |
| 96 data = [ |
| 97 "mash_service_overrides.json", |
| 98 ] |
| 99 } |
| OLD | NEW |