Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(273)

Side by Side Diff: chrome/test/BUILD.gn

Issue 2832943003: Fixs catalogs for mash/mus (Closed)
Patch Set: Created 3 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 5159 matching lines...) Expand 10 before | Expand all | Expand 10 after
5170 5170
5171 if (is_linux && !is_android) { 5171 if (is_linux && !is_android) {
5172 packaged_services += [ "//components/font_service:manifest" ] 5172 packaged_services += [ "//components/font_service:manifest" ]
5173 } 5173 }
5174 } 5174 }
5175 5175
5176 catalog("mash_browser_tests_catalog") { 5176 catalog("mash_browser_tests_catalog") {
5177 testonly = true 5177 testonly = true
5178 embedded_services = [ ":mash_browser_tests_manifest" ] 5178 embedded_services = [ ":mash_browser_tests_manifest" ]
5179 standalone_services = [ "//services/tracing:manifest" ] 5179 standalone_services = [ "//services/tracing:manifest" ]
5180 catalog_deps = [ "//chrome/app:catalog_for_mus" ] 5180 catalog_deps = [ "//chrome/app:catalog_for_mash" ]
5181 } 5181 }
5182 5182
5183 copy("mash_browser_tests_catalog_copy") { 5183 copy("mash_browser_tests_catalog_copy") {
5184 testonly = true 5184 testonly = true
5185 sources = get_target_outputs(":mash_browser_tests_catalog") 5185 sources = get_target_outputs(":mash_browser_tests_catalog")
5186 outputs = [ 5186 outputs = [
5187 "${root_out_dir}/mash_browser_tests_catalog.json", 5187 "${root_out_dir}/mash_browser_tests_catalog.json",
5188 ] 5188 ]
5189 deps = [ 5189 deps = [
5190 ":mash_browser_tests_catalog", 5190 ":mash_browser_tests_catalog",
(...skipping 19 matching lines...) Expand all
5210 name = "mus_browser_tests" 5210 name = "mus_browser_tests"
5211 5211
5212 source = "base/mus_browser_tests_manifest.json" 5212 source = "base/mus_browser_tests_manifest.json"
5213 packaged_services = [ "//services/ui:manifest" ] 5213 packaged_services = [ "//services/ui:manifest" ]
5214 } 5214 }
5215 5215
5216 catalog("mus_browser_tests_catalog") { 5216 catalog("mus_browser_tests_catalog") {
5217 testonly = true 5217 testonly = true
5218 embedded_services = [ ":mus_browser_tests_manifest" ] 5218 embedded_services = [ ":mus_browser_tests_manifest" ]
5219 standalone_services = [ "//services/tracing:manifest" ] 5219 standalone_services = [ "//services/tracing:manifest" ]
5220 catalog_deps = [ "//chrome/app:catalog_for_mus" ] 5220 catalog_deps = [ "//chrome/app:catalog" ]
5221 } 5221 }
5222 5222
5223 copy("mus_browser_tests_catalog_copy") { 5223 copy("mus_browser_tests_catalog_copy") {
5224 testonly = true 5224 testonly = true
5225 sources = get_target_outputs(":mus_browser_tests_catalog") 5225 sources = get_target_outputs(":mus_browser_tests_catalog")
5226 outputs = [ 5226 outputs = [
5227 "${root_out_dir}/mus_browser_tests_catalog.json", 5227 "${root_out_dir}/mus_browser_tests_catalog.json",
5228 ] 5228 ]
5229 deps = [ 5229 deps = [
5230 ":mus_browser_tests_catalog", 5230 ":mus_browser_tests_catalog",
5231 ] 5231 ]
5232 } 5232 }
5233 } 5233 }
5234 5234
5235 if (is_win) { 5235 if (is_win) {
5236 loadable_module("conflicts_dll") { 5236 loadable_module("conflicts_dll") {
5237 testonly = true 5237 testonly = true
5238 sources = [ 5238 sources = [
5239 "conflicts/conflicts_dll.cc", 5239 "conflicts/conflicts_dll.cc",
5240 ] 5240 ]
5241 } 5241 }
5242 } 5242 }
OLDNEW
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698