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

Side by Side Diff: components/nacl/BUILD.gn

Issue 1042453002: Fix all errors reported by 'gn check' in components/nacl. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: revert change in .gn Created 5 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 | 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 (c) 2015 The Chromium Authors. All rights reserved. 1 # Copyright (c) 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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//testing/test.gni") 7 import("//testing/test.gni")
8 8
9 if (enable_nacl) { 9 if (enable_nacl) {
10 source_set("nacl") { 10 source_set("nacl") {
11 sources = [ 11 sources = [
12 "loader/nacl_ipc_adapter.cc", 12 "loader/nacl_ipc_adapter.cc",
13 "loader/nacl_ipc_adapter.h", 13 "loader/nacl_ipc_adapter.h",
14 "loader/nacl_listener.cc", 14 "loader/nacl_listener.cc",
15 "loader/nacl_listener.h", 15 "loader/nacl_listener.h",
16 "loader/nacl_main.cc", 16 "loader/nacl_main.cc",
17 "loader/nacl_main_platform_delegate.h", 17 "loader/nacl_main_platform_delegate.h",
18 "loader/nacl_main_platform_delegate_linux.cc", 18 "loader/nacl_main_platform_delegate_linux.cc",
19 "loader/nacl_main_platform_delegate_mac.mm", 19 "loader/nacl_main_platform_delegate_mac.mm",
20 "loader/nacl_main_platform_delegate_win.cc", 20 "loader/nacl_main_platform_delegate_win.cc",
21 "loader/nacl_trusted_listener.cc", 21 "loader/nacl_trusted_listener.cc",
22 "loader/nacl_trusted_listener.h", 22 "loader/nacl_trusted_listener.h",
23 "loader/nacl_validation_db.h", 23 "loader/nacl_validation_db.h",
24 "loader/nacl_validation_query.cc", 24 "loader/nacl_validation_query.cc",
25 "loader/nacl_validation_query.h", 25 "loader/nacl_validation_query.h",
26 ] 26 ]
27 27
28 deps = [ 28 deps = [
29 ":nacl_common",
30 ":nacl_switches",
29 "//base", 31 "//base",
30 "//base:base_static", 32 "//base:base_static",
33 "//content/public/common",
34 "//crypto",
31 "//ipc", 35 "//ipc",
32 "//mojo/nacl:monacl_sel", 36 "//mojo/nacl:monacl_sel",
33 "//native_client/src/trusted/service_runtime:sel_main_chrome", 37 "//native_client/src/trusted/service_runtime:sel_main_chrome",
38 "//ppapi/c",
34 "//ppapi/proxy:ipc", 39 "//ppapi/proxy:ipc",
35 "//ppapi/shared_impl", 40 "//ppapi/shared_impl",
41 "//third_party/mojo/src/mojo/edk/embedder",
36 ] 42 ]
37 43
38 if (enable_nacl_untrusted) { 44 if (enable_nacl_untrusted) {
39 data_deps = [ 45 data_deps = [
40 # TODO(GYP): handle other architectures correctly. 46 # TODO(GYP): handle other architectures correctly.
41 "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt _x64)", 47 "//ppapi/native_client:nacl_irt(//native_client/build/toolchain/nacl:irt _x64)",
42 ] 48 ]
43 } 49 }
44 if (enable_pnacl) { 50 if (enable_pnacl) {
45 data_deps += [ 51 data_deps += [
(...skipping 23 matching lines...) Expand all
69 "browser/pnacl_host.h", 75 "browser/pnacl_host.h",
70 "browser/pnacl_translation_cache.cc", 76 "browser/pnacl_translation_cache.cc",
71 "browser/pnacl_translation_cache.h", 77 "browser/pnacl_translation_cache.h",
72 "common/nacl_debug_exception_handler_win.cc", 78 "common/nacl_debug_exception_handler_win.cc",
73 "common/nacl_debug_exception_handler_win.h", 79 "common/nacl_debug_exception_handler_win.h",
74 ] 80 ]
75 81
76 deps = [ 82 deps = [
77 ":nacl_common", 83 ":nacl_common",
78 ":nacl_switches", 84 ":nacl_switches",
85 ":nacl_helper",
86 "//base",
87 "//base/third_party/dynamic_annotations",
88 "//content/public/browser",
89 "//content/public/common",
90 "//ipc",
79 "//native_client/src/trusted/service_runtime:sel_main_chrome", 91 "//native_client/src/trusted/service_runtime:sel_main_chrome",
80 "//content//public/browser", 92 "//net",
93 "//ppapi/host",
94 "//ppapi/proxy:ipc",
95 "//ppapi/shared_impl",
96 "//sandbox/linux:sandbox_services",
81 ] 97 ]
82 98
83 if (is_linux) { 99 if (is_linux) {
84 sources += [ 100 sources += [
85 "zygote/nacl_fork_delegate_linux.cc", 101 "zygote/nacl_fork_delegate_linux.cc",
86 "zygote/nacl_fork_delegate_linux.h", 102 "zygote/nacl_fork_delegate_linux.h",
87 ] 103 ]
88 104
89 deps += [ "//sandbox/linux:suid_sandbox_client" ] 105 deps += [ "//sandbox/linux:suid_sandbox_client" ]
90 } 106 }
(...skipping 22 matching lines...) Expand all
113 "renderer/ppb_nacl_private_impl.cc", 129 "renderer/ppb_nacl_private_impl.cc",
114 "renderer/ppb_nacl_private_impl.h", 130 "renderer/ppb_nacl_private_impl.h",
115 "renderer/progress_event.cc", 131 "renderer/progress_event.cc",
116 "renderer/progress_event.h", 132 "renderer/progress_event.h",
117 "renderer/trusted_plugin_channel.cc", 133 "renderer/trusted_plugin_channel.cc",
118 "renderer/trusted_plugin_channel.h", 134 "renderer/trusted_plugin_channel.h",
119 ] 135 ]
120 136
121 deps = [ 137 deps = [
122 ":nacl_common", 138 ":nacl_common",
139 ":nacl_switches",
123 "renderer/plugin:nacl_trusted_plugin", 140 "renderer/plugin:nacl_trusted_plugin",
141 "//base",
142 "//content/public/common",
124 "//content/public/renderer", 143 "//content/public/renderer",
144 "//ipc",
145 "//net",
146 "//ppapi/c",
147 "//ppapi/proxy:ipc",
148 "//ppapi/shared_impl",
149 "//ppapi/thunk",
150 "//third_party/WebKit/public:blink",
125 "//third_party/jsoncpp", 151 "//third_party/jsoncpp",
126 "//third_party/WebKit/public:blink",
127 ] 152 ]
128 } 153 }
129 154
130 test("nacl_loader_unittests") { 155 test("nacl_loader_unittests") {
131 sources = [ 156 sources = [
132 "loader/run_all_unittests.cc", 157 "loader/run_all_unittests.cc",
133 ] 158 ]
134 159
135 deps = [ 160 deps = [
136 ":nacl", 161 ":nacl",
137 "//base/test:test_support", 162 "//base/test:test_support",
138 "//testing/gtest", 163 "//testing/gtest",
139 ] 164 ]
140 } 165 }
141 166
142 if (is_linux) { 167 if (is_linux) {
143 executable("nacl_helper") { 168 executable("nacl_helper") {
144 sources = [ 169 sources = [
145 "loader/nacl_helper_linux.cc", 170 "loader/nacl_helper_linux.cc",
146 "loader/nacl_helper_linux.h", 171 "loader/nacl_helper_linux.h",
147 ] 172 ]
148 173
149 deps = [ 174 deps = [
175 ":nacl",
150 ":nacl_linux", 176 ":nacl_linux",
177 ":nacl_switches",
178 "//base",
179 "//content/public/common",
180 "//crypto",
181 "//ipc",
151 "//mojo/nacl:monacl_sel", 182 "//mojo/nacl:monacl_sel",
183 "//sandbox/linux:libc_urandom_override",
152 ] 184 ]
153 185
154 cflags = [ "-fPIE" ] 186 cflags = [ "-fPIE" ]
155 187
156 ldflags = [ "-pie" ] 188 ldflags = [ "-pie" ]
157 } 189 }
158 190
159 source_set("nacl_linux") { 191 source_set("nacl_linux") {
160 sources = [ 192 sources = [
161 "//ppapi/nacl_irt/irt_manifest.h", 193 "//ppapi/nacl_irt/irt_manifest.h",
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 "loader/sandbox_linux/nacl_bpf_sandbox_linux.cc", 226 "loader/sandbox_linux/nacl_bpf_sandbox_linux.cc",
195 "loader/sandbox_linux/nacl_sandbox_linux.cc", 227 "loader/sandbox_linux/nacl_sandbox_linux.cc",
196 ] 228 ]
197 229
198 defines = [ "IN_NACL_HELPER=1" ] 230 defines = [ "IN_NACL_HELPER=1" ]
199 231
200 deps = [ 232 deps = [
201 ":nacl", 233 ":nacl",
202 ":nacl_common", 234 ":nacl_common",
203 ":nacl_switches", 235 ":nacl_switches",
236 "//base",
204 "//components/tracing", 237 "//components/tracing",
238 "//content/public/common",
205 "//crypto", 239 "//crypto",
240 "//ipc",
241 "//ppapi/c",
206 "//ppapi/proxy", 242 "//ppapi/proxy",
243 "//ppapi/shared_impl",
244 "//sandbox",
207 "//sandbox/linux:libc_urandom_override", 245 "//sandbox/linux:libc_urandom_override",
208 "//sandbox", 246 "//sandbox/linux:sandbox_services_headers",
209 ] 247 ]
210 248
211 if (use_glib) { 249 if (use_glib) {
212 configs += [ "//build/config/linux:glib" ] 250 configs += [ "//build/config/linux:glib" ]
213 } 251 }
214 252
215 if (use_seccomp_bpf) { 253 if (use_seccomp_bpf) {
216 defines += [ "USE_SECCOMP_BPF" ] 254 defines += [ "USE_SECCOMP_BPF" ]
217 } 255 }
218 } 256 }
(...skipping 28 matching lines...) Expand all
247 "common/nacl_sandbox_type_mac.h", 285 "common/nacl_sandbox_type_mac.h",
248 "common/nacl_types.cc", 286 "common/nacl_types.cc",
249 "common/nacl_types.h", 287 "common/nacl_types.h",
250 "common/nacl_types_param_traits.cc", 288 "common/nacl_types_param_traits.cc",
251 "common/nacl_types_param_traits.h", 289 "common/nacl_types_param_traits.h",
252 "common/pnacl_types.cc", 290 "common/pnacl_types.cc",
253 "common/pnacl_types.h", 291 "common/pnacl_types.h",
254 ] 292 ]
255 293
256 deps = [ 294 deps = [
295 ":nacl_switches",
296 "//base",
257 "//content/public/common", 297 "//content/public/common",
298 "//ipc",
299 "//url",
258 ] 300 ]
259 301
260 if (is_linux) { 302 if (is_linux) {
261 sources += [ 303 sources += [
262 "common/nacl_paths.cc", 304 "common/nacl_paths.cc",
263 "common/nacl_paths.h", 305 "common/nacl_paths.h",
264 ] 306 ]
265 307
266 defines = [ "__STDC_LIMIT_MACROS=1" ] 308 defines = [ "__STDC_LIMIT_MACROS=1" ]
267 } 309 }
268 } 310 }
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