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

Side by Side Diff: chrome/app/mash/BUILD.gn

Issue 2680283003: Switch mash_browser_tests to Ozone X11 platform. (Closed)
Patch Set: Drop --use-test-config, it's added automatically. Created 3 years, 10 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 | « no previous file | chrome/test/BUILD.gn » ('j') | chrome/test/BUILD.gn » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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("//chrome/common/features.gni")
6 import("//services/catalog/public/tools/catalog.gni") 7 import("//services/catalog/public/tools/catalog.gni")
7 import("//services/service_manager/public/service_manifest.gni") 8 import("//services/service_manager/public/service_manifest.gni")
8 9
10 assert(enable_package_mash_services)
11
9 source_set("mash") { 12 source_set("mash") {
10 sources = [ 13 sources = [
11 "mash_runner.cc", 14 "mash_runner.cc",
12 "mash_runner.h", 15 "mash_runner.h",
13 ] 16 ]
14 deps = [ 17 deps = [
15 ":chrome_mash_catalog", 18 ":chrome_mash_catalog",
16 "//base:i18n", 19 "//base:i18n",
17 "//components/tracing:startup_tracing", 20 "//components/tracing:startup_tracing",
18 "//content/public/common", 21 "//content/public/common",
(...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after
73 76
74 catalog("catalog") { 77 catalog("catalog") {
75 embedded_services = [ ":mash_manifest" ] 78 embedded_services = [ ":mash_manifest" ]
76 catalog_deps = [ "//chrome/app:catalog" ] 79 catalog_deps = [ "//chrome/app:catalog" ]
77 } 80 }
78 81
79 catalog_cpp_source("chrome_mash_catalog") { 82 catalog_cpp_source("chrome_mash_catalog") {
80 catalog = ":catalog" 83 catalog = ":catalog"
81 generated_function_name = "CreateChromeMashCatalog" 84 generated_function_name = "CreateChromeMashCatalog"
82 } 85 }
86
87 source_set("mash_service_overrides") {
88 testonly = true
89 data = [
90 "mash_service_overrides.json",
91 ]
92 }
OLDNEW
« no previous file with comments | « no previous file | chrome/test/BUILD.gn » ('j') | chrome/test/BUILD.gn » ('J')

Powered by Google App Engine
This is Rietveld 408576698