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

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

Issue 2863163003: Add nacl_loader_manifest to catalog_mus. (Closed)
Patch Set: remove nacl_broker_manifest until its needed. Created 3 years, 7 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 | no next file » | 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 87 matching lines...) Expand 10 before | Expand all | Expand 10 after
98 98
99 if (is_chromeos) { 99 if (is_chromeos) {
100 catalog("catalog_mus") { 100 catalog("catalog_mus") {
101 catalog_deps = [ "//chrome/app:catalog" ] 101 catalog_deps = [ "//chrome/app:catalog" ]
102 embedded_services = [ 102 embedded_services = [
103 "//services/ui:manifest", 103 "//services/ui:manifest",
104 104
105 # TODO(sky): verify if we need this. 105 # TODO(sky): verify if we need this.
106 "//services/ui/ime/test_ime_driver:manifest", 106 "//services/ui/ime/test_ime_driver:manifest",
107 ] 107 ]
108
109 if (enable_nacl) {
110 embedded_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
111 }
108 } 112 }
109 113
110 catalog_cpp_source("chrome_mus_catalog") { 114 catalog_cpp_source("chrome_mus_catalog") {
111 catalog = ":catalog_mus" 115 catalog = ":catalog_mus"
112 generated_function_name = "CreateChromeMusCatalog" 116 generated_function_name = "CreateChromeMusCatalog"
113 } 117 }
114 } 118 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698