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

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

Issue 2775873002: Adds the ability to run chromeos with mus (Closed)
Patch Set: merge 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/chrome_main.cc ('k') | chrome/app/mash/chrome_mash_manifest.json » ('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 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("//chrome/common/features.gni")
7 import("//services/catalog/public/tools/catalog.gni") 7 import("//services/catalog/public/tools/catalog.gni")
8 import("//services/service_manager/public/service_manifest.gni") 8 import("//services/service_manager/public/service_manifest.gni")
9 9
10 assert(enable_package_mash_services) 10 assert(enable_package_mash_services)
(...skipping 20 matching lines...) Expand all
31 "//services/service_manager/public/interfaces", 31 "//services/service_manager/public/interfaces",
32 "//services/service_manager/runner:init", 32 "//services/service_manager/runner:init",
33 "//services/service_manager/runner/common", 33 "//services/service_manager/runner/common",
34 "//services/service_manager/runner/host:lib", 34 "//services/service_manager/runner/host:lib",
35 "//services/service_manager/standalone", 35 "//services/service_manager/standalone",
36 "//services/ui/public/interfaces:constants", 36 "//services/ui/public/interfaces:constants",
37 "//url", 37 "//url",
38 ] 38 ]
39 39
40 if (is_chromeos) { 40 if (is_chromeos) {
41 deps += [ "//ash/resources" ] 41 deps += [
42 ":chrome_mus_catalog",
43 "//ash/resources",
44 ]
42 } 45 }
43 46
44 if (is_posix) { 47 if (is_posix) {
45 deps += [ "//chrome/app:shutdown_signal_handlers" ] 48 deps += [ "//chrome/app:shutdown_signal_handlers" ]
46 } 49 }
47 50
48 if (is_linux && !is_android) { 51 if (is_linux && !is_android) {
49 deps += [ "//components/font_service:lib" ] 52 deps += [ "//components/font_service:lib" ]
50 } 53 }
51 } 54 }
(...skipping 22 matching lines...) Expand all
74 if (enable_nacl) { 77 if (enable_nacl) {
75 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ] 78 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
76 if (is_win && target_cpu == "x86") { 79 if (is_win && target_cpu == "x86") {
77 packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ] 80 packaged_services += [ "//components/nacl/broker:nacl_broker_manifest" ]
78 } 81 }
79 } 82 }
80 } 83 }
81 84
82 catalog("catalog") { 85 catalog("catalog") {
83 embedded_services = [ ":mash_manifest" ] 86 embedded_services = [ ":mash_manifest" ]
84 catalog_deps = [ "//chrome/app:catalog_for_mash" ] 87 catalog_deps = [ "//chrome/app:catalog_for_mus" ]
85 standalone_services = [ 88 standalone_services = [
86 "//mash/example/views_examples:manifest", 89 "//mash/example/views_examples:manifest",
87 "//mash/simple_wm:manifest", 90 "//mash/simple_wm:manifest",
88 ] 91 ]
89 } 92 }
90 93
91 catalog_cpp_source("chrome_mash_catalog") { 94 catalog_cpp_source("chrome_mash_catalog") {
92 catalog = ":catalog" 95 catalog = ":catalog"
93 generated_function_name = "CreateChromeMashCatalog" 96 generated_function_name = "CreateChromeMashCatalog"
94 } 97 }
95 98
96 source_set("mash_service_overrides") { 99 source_set("mash_service_overrides") {
97 testonly = true 100 testonly = true
98 data = [ 101 data = [
99 "mash_service_overrides.json", 102 "mash_service_overrides.json",
100 ] 103 ]
101 } 104 }
105
106 if (is_chromeos) {
107 service_manifest("mus_manifest") {
108 name = "chrome_mus"
109 source = "chrome_mus_manifest.json"
110 packaged_services = [
111 "//services/ui:manifest",
112
113 # TODO(sky): verify if we need this.
114 "//services/ui/ime/test_ime_driver:manifest",
115 ]
116
117 if (enable_nacl) {
118 packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
119 }
120 }
121
122 catalog("catalog_mus") {
123 embedded_services = [ ":mus_manifest" ]
124 catalog_deps = [ "//chrome/app:catalog_for_mus" ]
125 }
126
127 catalog_cpp_source("chrome_mus_catalog") {
128 catalog = ":catalog_mus"
129 generated_function_name = "CreateChromeMusCatalog"
130 }
131 }
OLDNEW
« no previous file with comments | « chrome/app/chrome_main.cc ('k') | chrome/app/mash/chrome_mash_manifest.json » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698