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

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

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

Powered by Google App Engine
This is Rietveld 408576698