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

Unified Diff: chrome/app/mash/BUILD.gn

Issue 2389133008: Mash: Replaces "exe:chrome" with "service:content_browser" (Closed)
Patch Set: rebase Created 4 years, 2 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/BUILD.gn ('k') | chrome/app/mash/DEPS » ('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 6611b7d23db00fc891f4fbb2c603ee2d9eb0fc5c..2d972202bf7981524107ad2d7a1dc232a9431320 100644
--- a/chrome/app/mash/BUILD.gn
+++ b/chrome/app/mash/BUILD.gn
@@ -15,6 +15,7 @@ source_set("mash") {
"//components/tracing:startup_tracing",
"//content/public/common",
"//mash/package",
+ "//services/catalog/public/interfaces",
"//services/shell",
"//services/shell/background:lib",
"//services/shell/public/cpp",
@@ -25,7 +26,9 @@ source_set("mash") {
"//url",
]
data_deps = [
- ":manifest",
+ ":browser_manifest",
+ ":mash_manifest",
+ "//chrome/app:service_manifests",
]
if (is_linux && !is_android) {
@@ -33,8 +36,7 @@ source_set("mash") {
}
}
-service_manifest("manifest") {
- type = "exe"
+service_manifest("mash_manifest") {
name = "chrome_mash"
source = "chrome_mash_manifest.json"
deps = [
@@ -65,3 +67,13 @@ service_manifest("manifest") {
packaged_services += [ "font_service" ]
}
}
+
+service_manifest("browser_manifest") {
+ name = "content_browser"
+ source = "${root_out_dir}/Packages/chrome_content_browser/manifest.json"
+ output_name = "chrome_mash_content_browser"
+ deps = [
+ "//chrome/app:chrome_content_browser_manifest",
+ ]
+ overlays = [ "chrome_mash_content_browser_manifest_overlay.json" ]
+}
« no previous file with comments | « chrome/app/BUILD.gn ('k') | chrome/app/mash/DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698