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

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

Issue 2775873002: Adds the ability to run chromeos with mus (Closed)
Patch Set: Created 3 years, 9 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
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 5184 matching lines...) Expand 10 before | Expand all | Expand 10 after
5195 5195
5196 if (is_linux && !is_android) { 5196 if (is_linux && !is_android) {
5197 packaged_services += [ "//components/font_service:manifest" ] 5197 packaged_services += [ "//components/font_service:manifest" ]
5198 } 5198 }
5199 } 5199 }
5200 5200
5201 catalog("mash_browser_tests_catalog") { 5201 catalog("mash_browser_tests_catalog") {
5202 testonly = true 5202 testonly = true
5203 embedded_services = [ ":mash_browser_tests_manifest" ] 5203 embedded_services = [ ":mash_browser_tests_manifest" ]
5204 standalone_services = [ "//services/tracing:manifest" ] 5204 standalone_services = [ "//services/tracing:manifest" ]
5205 catalog_deps = [ "//chrome/app:catalog_for_mash" ] 5205 catalog_deps = [ "//chrome/app:catalog_for_mus" ]
5206 } 5206 }
5207 5207
5208 copy("mash_browser_tests_catalog_copy") { 5208 copy("mash_browser_tests_catalog_copy") {
5209 testonly = true 5209 testonly = true
5210 sources = get_target_outputs(":mash_browser_tests_catalog") 5210 sources = get_target_outputs(":mash_browser_tests_catalog")
5211 outputs = [ 5211 outputs = [
5212 "${root_out_dir}/mash_browser_tests_catalog.json", 5212 "${root_out_dir}/mash_browser_tests_catalog.json",
5213 ] 5213 ]
5214 deps = [ 5214 deps = [
5215 ":mash_browser_tests_catalog", 5215 ":mash_browser_tests_catalog",
5216 ] 5216 ]
5217 } 5217 }
5218 } 5218 }
5219 5219
5220 if (is_win) { 5220 if (is_win) {
5221 loadable_module("conflicts_dll") { 5221 loadable_module("conflicts_dll") {
5222 testonly = true 5222 testonly = true
5223 sources = [ 5223 sources = [
5224 "conflicts/conflicts_dll.cc", 5224 "conflicts/conflicts_dll.cc",
5225 ] 5225 ]
5226 } 5226 }
5227 } 5227 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698