| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 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/chrome_build.gni") | 5 import("//build/config/chrome_build.gni") |
| 6 import("//build/config/compiler/compiler.gni") | 6 import("//build/config/compiler/compiler.gni") |
| 7 import("//build/config/crypto.gni") | 7 import("//build/config/crypto.gni") |
| 8 import("//build/config/features.gni") | 8 import("//build/config/features.gni") |
| 9 import("//build/config/ui.gni") | 9 import("//build/config/ui.gni") |
| 10 import("//chrome/common/features.gni") | 10 import("//chrome/common/features.gni") |
| (...skipping 5138 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5149 | 5149 |
| 5150 if (is_linux && !is_android) { | 5150 if (is_linux && !is_android) { |
| 5151 packaged_services += [ "//components/font_service:manifest" ] | 5151 packaged_services += [ "//components/font_service:manifest" ] |
| 5152 } | 5152 } |
| 5153 } | 5153 } |
| 5154 | 5154 |
| 5155 catalog("mash_browser_tests_catalog") { | 5155 catalog("mash_browser_tests_catalog") { |
| 5156 testonly = true | 5156 testonly = true |
| 5157 embedded_services = [ ":mash_browser_tests_manifest" ] | 5157 embedded_services = [ ":mash_browser_tests_manifest" ] |
| 5158 standalone_services = [ "//services/tracing:manifest" ] | 5158 standalone_services = [ "//services/tracing:manifest" ] |
| 5159 catalog_deps = [ "//chrome/app:catalog" ] | 5159 catalog_deps = [ "//chrome/app:catalog_for_mash" ] |
| 5160 } | 5160 } |
| 5161 | 5161 |
| 5162 copy("mash_browser_tests_catalog_copy") { | 5162 copy("mash_browser_tests_catalog_copy") { |
| 5163 testonly = true | 5163 testonly = true |
| 5164 sources = get_target_outputs(":mash_browser_tests_catalog") | 5164 sources = get_target_outputs(":mash_browser_tests_catalog") |
| 5165 outputs = [ | 5165 outputs = [ |
| 5166 "${root_out_dir}/mash_browser_tests_catalog.json", | 5166 "${root_out_dir}/mash_browser_tests_catalog.json", |
| 5167 ] | 5167 ] |
| 5168 deps = [ | 5168 deps = [ |
| 5169 ":mash_browser_tests_catalog", | 5169 ":mash_browser_tests_catalog", |
| 5170 ] | 5170 ] |
| 5171 } | 5171 } |
| 5172 } | 5172 } |
| 5173 | 5173 |
| 5174 if (is_win) { | 5174 if (is_win) { |
| 5175 loadable_module("conflicts_dll") { | 5175 loadable_module("conflicts_dll") { |
| 5176 testonly = true | 5176 testonly = true |
| 5177 sources = [ | 5177 sources = [ |
| 5178 "conflicts/conflicts_dll.cc", | 5178 "conflicts/conflicts_dll.cc", |
| 5179 ] | 5179 ] |
| 5180 } | 5180 } |
| 5181 } | 5181 } |
| OLD | NEW |