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

Unified Diff: chrome/app/mash/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 side-by-side diff with in-line comments
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 »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/app/mash/BUILD.gn
diff --git a/chrome/app/mash/BUILD.gn b/chrome/app/mash/BUILD.gn
index 68caea6cc1a08c08c671e3c8d310cf345c8b1ecf..ba8bd1ff687d39b92d7c821a19816618715f5abd 100644
--- a/chrome/app/mash/BUILD.gn
+++ b/chrome/app/mash/BUILD.gn
@@ -38,7 +38,10 @@ source_set("mash") {
]
if (is_chromeos) {
- deps += [ "//ash/resources" ]
+ deps += [
+ ":chrome_mus_catalog",
+ "//ash/resources",
+ ]
}
if (is_posix) {
@@ -81,7 +84,7 @@ service_manifest("mash_manifest") {
catalog("catalog") {
embedded_services = [ ":mash_manifest" ]
- catalog_deps = [ "//chrome/app:catalog_for_mash" ]
+ catalog_deps = [ "//chrome/app:catalog_for_mus" ]
standalone_services = [
"//mash/example/views_examples:manifest",
"//mash/simple_wm:manifest",
@@ -99,3 +102,30 @@ source_set("mash_service_overrides") {
"mash_service_overrides.json",
]
}
+
+if (is_chromeos) {
+ service_manifest("mus_manifest") {
+ name = "chrome_mus"
+ source = "chrome_mus_manifest.json"
+ packaged_services = [
+ "//services/ui:manifest",
+
+ # TODO(sky): verify if we need this.
+ "//services/ui/ime/test_ime_driver:manifest",
+ ]
+
+ if (enable_nacl) {
+ packaged_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
+ }
+ }
+
+ catalog("catalog_mus") {
+ embedded_services = [ ":mus_manifest" ]
+ catalog_deps = [ "//chrome/app:catalog_for_mus" ]
+ }
+
+ catalog_cpp_source("chrome_mus_catalog") {
+ catalog = ":catalog_mus"
+ generated_function_name = "CreateChromeMusCatalog"
+ }
+}
« 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