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

Side by Side Diff: chrome/app/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 | « no previous file | chrome/app/chrome_main.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/ui.gni") 5 import("//build/config/ui.gni")
6 import("//chrome/common/features.gni") 6 import("//chrome/common/features.gni")
7 import("//ppapi/features/features.gni") 7 import("//ppapi/features/features.gni")
8 import("//printing/features/features.gni") 8 import("//printing/features/features.gni")
9 import("//services/catalog/public/tools/catalog.gni") 9 import("//services/catalog/public/tools/catalog.gni")
10 import("//services/service_manager/public/service_manifest.gni") 10 import("//services/service_manager/public/service_manifest.gni")
(...skipping 474 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 485
486 chrome_embedded_services = [ 486 chrome_embedded_services = [
487 ":chrome_content_browser_manifest", 487 ":chrome_content_browser_manifest",
488 ":chrome_content_gpu_manifest", 488 ":chrome_content_gpu_manifest",
489 ":chrome_content_plugin_manifest", 489 ":chrome_content_plugin_manifest",
490 ":chrome_content_renderer_manifest", 490 ":chrome_content_renderer_manifest",
491 ":chrome_content_utility_manifest", 491 ":chrome_content_utility_manifest",
492 ] 492 ]
493 493
494 if (enable_package_mash_services) { 494 if (enable_package_mash_services) {
495 catalog("catalog_for_mash") { 495 catalog("catalog_for_mus") {
496 embedded_services = 496 embedded_services =
497 chrome_embedded_services + 497 chrome_embedded_services +
498 [ ":chrome_content_packaged_services_manifest_for_mash" ] 498 [ ":chrome_content_packaged_services_manifest_for_mash" ]
499 } 499 }
500 } 500 }
501 501
502 catalog("catalog") { 502 catalog("catalog") {
503 embedded_services = chrome_embedded_services + 503 embedded_services = chrome_embedded_services +
504 [ ":chrome_content_packaged_services_manifest" ] 504 [ ":chrome_content_packaged_services_manifest" ]
505 } 505 }
506 } 506 }
OLDNEW
« no previous file with comments | « no previous file | chrome/app/chrome_main.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698