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

Side by Side Diff: mash/BUILD.gn

Issue 2664893002: Enable nacl_loader service in mustash (Closed)
Patch Set: Update Created 3 years, 10 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/mash/BUILD.gn ('k') | 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 2015 The Chromium Authors. All rights reserved. 1 # Copyright 2015 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("//services/catalog/public/tools/catalog.gni") 6 import("//services/catalog/public/tools/catalog.gni")
6 import("//services/service_manager/public/service_manifest.gni") 7 import("//services/service_manager/public/service_manifest.gni")
7 import("//testing/test.gni") 8 import("//testing/test.gni")
8 9
9 # Target that builders build. 10 # Target that builders build.
10 group("all") { 11 group("all") {
11 testonly = true 12 testonly = true
12 13
13 deps = [ 14 deps = [
14 ":mash_catalog", 15 ":mash_catalog",
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
66 67
67 catalog_deps = [ "//mash/example:catalog" ] 68 catalog_deps = [ "//mash/example:catalog" ]
68 69
69 if (is_chromeos) { 70 if (is_chromeos) {
70 standalone_services += [ "//ash/mus:manifest" ] 71 standalone_services += [ "//ash/mus:manifest" ]
71 } 72 }
72 73
73 if (is_linux && !is_android) { 74 if (is_linux && !is_android) {
74 standalone_services += [ "//components/font_service:manifest" ] 75 standalone_services += [ "//components/font_service:manifest" ]
75 } 76 }
77
78 if (enable_nacl) {
79 standalone_services += [ "//components/nacl/loader:nacl_loader_manifest" ]
80 if (is_win && target_cpu == "x86") {
81 standalone_services += [ "//components/nacl/broker:nacl_broker_manifest" ]
82 }
83 }
76 } 84 }
77 85
78 copy("mash_catalog") { 86 copy("mash_catalog") {
79 testonly = true 87 testonly = true
80 sources = get_target_outputs(":catalog") 88 sources = get_target_outputs(":catalog")
81 outputs = [ 89 outputs = [
82 "$root_out_dir/mash_catalog.json", 90 "$root_out_dir/mash_catalog.json",
83 ] 91 ]
84 deps = [ 92 deps = [
85 ":catalog", 93 ":catalog",
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
143 testonly = true 151 testonly = true
144 sources = get_target_outputs(":mash_unittests_catalog") 152 sources = get_target_outputs(":mash_unittests_catalog")
145 outputs = [ 153 outputs = [
146 "${root_out_dir}/mash_unittests_catalog.json", 154 "${root_out_dir}/mash_unittests_catalog.json",
147 ] 155 ]
148 deps = [ 156 deps = [
149 ":mash_unittests_catalog", 157 ":mash_unittests_catalog",
150 ] 158 ]
151 } 159 }
152 } 160 }
OLDNEW
« no previous file with comments | « chrome/app/mash/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698