Chromium Code Reviews| OLD | NEW |
|---|---|
| 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/crypto.gni") | 5 import("//build/config/crypto.gni") |
| 6 import("//build/config/features.gni") | 6 import("//build/config/features.gni") |
| 7 import("//build/config/nacl/config.gni") | |
| 7 import("//build/config/ui.gni") | 8 import("//build/config/ui.gni") |
| 8 import("//testing/test.gni") | 9 import("//testing/test.gni") |
| 9 | 10 |
| 10 if (enable_nacl) { | 11 if (enable_nacl) { |
| 11 source_set("nacl") { | 12 source_set("nacl") { |
| 12 sources = [ | 13 sources = [ |
| 13 "loader/nacl_ipc_adapter.cc", | 14 "loader/nacl_ipc_adapter.cc", |
| 14 "loader/nacl_ipc_adapter.h", | 15 "loader/nacl_ipc_adapter.h", |
| 15 "loader/nacl_listener.cc", | 16 "loader/nacl_listener.cc", |
| 16 "loader/nacl_listener.h", | 17 "loader/nacl_listener.h", |
| (...skipping 210 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 227 | 228 |
| 228 if (use_glib) { | 229 if (use_glib) { |
| 229 configs += [ "//build/config/linux:glib" ] | 230 configs += [ "//build/config/linux:glib" ] |
| 230 } | 231 } |
| 231 | 232 |
| 232 if (use_seccomp_bpf) { | 233 if (use_seccomp_bpf) { |
| 233 defines += [ "USE_SECCOMP_BPF" ] | 234 defines += [ "USE_SECCOMP_BPF" ] |
| 234 } | 235 } |
| 235 } | 236 } |
| 236 } | 237 } |
| 237 } else { | 238 |
| 238 group("nacl") { | 239 if (is_nacl_nonsfi) { |
| 240 executable("nacl_helper_nonsfi_nexe") { | |
| 241 output_name = "nacl_helper_nonsfi" | |
| 242 set_sources_assignment_filter([]) | |
| 243 sources = [ | |
| 244 "common/nacl_messages.cc", | |
| 245 "common/nacl_messages.h", | |
| 246 "common/nacl_types.cc", | |
| 247 "common/nacl_types.h", | |
| 248 "common/nacl_types_param_traits.cc", | |
| 249 "common/nacl_types_param_traits.h", | |
| 250 "loader/nacl_helper_linux.cc", | |
| 251 "loader/nacl_helper_linux.h", | |
| 252 "loader/nacl_trusted_listener.cc", | |
| 253 "loader/nacl_trusted_listener.h", | |
| 254 "loader/nonsfi/nonsfi_listener.cc", | |
| 255 "loader/nonsfi/nonsfi_listener.h", | |
| 256 "loader/nonsfi/nonsfi_main.cc", | |
| 257 "loader/nonsfi/nonsfi_main.h", | |
| 258 ] | |
| 259 deps = [ | |
| 260 ":nacl_switches", | |
| 261 ":nacl_helper_nonsfi_sandbox", | |
| 262 "//base", | |
| 263 "//components/tracing", | |
| 264 "//content", | |
| 265 "//ipc", | |
| 266 "//native_client/src/nonsfi/irt:nacl_sys_private", | |
| 267 "//native_client/src/nonsfi/loader:elf_loader", | |
| 268 "//native_client/src/untrusted/nacl:nacl", | |
| 269 "//ppapi/proxy", | |
| 270 "//sandbox/linux:sandbox", | |
| 271 ] | |
| 272 } | |
| 273 | |
| 274 source_set("nacl_helper_nonsfi_sandbox") { | |
| 275 set_sources_assignment_filter([]) | |
| 276 sources = [ | |
| 277 "loader/nonsfi/nonsfi_sandbox.cc", | |
| 278 "loader/nonsfi/nonsfi_sandbox.h", | |
| 279 "loader/sandbox_linux/nacl_sandbox_linux.cc", | |
| 280 "loader/sandbox_linux/nacl_sandbox_linux.h", | |
| 281 ] | |
| 282 deps = [ | |
| 283 "//base", | |
| 284 "//content", | |
| 285 "//sandbox/linux:sandbox", | |
| 286 ] | |
| 287 } | |
| 288 | |
| 289 copy("nacl_helper_nonsfi_copy") { | |
| 290 sources = [ | |
| 291 "${root_out_dir}/nacl_helper_nonsfi", | |
| 292 ] | |
| 293 outputs = [ | |
| 294 "${root_build_dir}/{{source_file_part}}", | |
| 295 ] | |
| 296 deps = [ | |
| 297 ":nacl_helper_nonsfi_nexe", | |
| 298 ] | |
| 299 } | |
| 239 } | 300 } |
| 240 group("nacl_helper") { | 301 |
| 302 group("nacl_helper_nonsfi") { | |
|
brettw
2015/10/26 00:49:47
This *should* work so I filed
https://code.google.
Petr Hosek
2015/10/26 01:55:11
Done.
| |
| 303 deps = [ | |
| 304 ":nacl_helper_nonsfi_copy(//build/toolchain/nacl:newlib_pnacl_nonsfi)", | |
| 305 ] | |
| 241 } | 306 } |
| 242 } | 307 } |
| 243 | 308 |
| 244 source_set("nacl_switches") { | 309 source_set("nacl_switches") { |
| 245 sources = [ | 310 sources = [ |
| 246 "common/nacl_switches.cc", | 311 "common/nacl_switches.cc", |
| 247 "common/nacl_switches.h", | 312 "common/nacl_switches.h", |
| 248 ] | 313 ] |
| 249 } | 314 } |
| 250 | 315 |
| (...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 282 | 347 |
| 283 if (is_linux) { | 348 if (is_linux) { |
| 284 sources += [ | 349 sources += [ |
| 285 "common/nacl_paths.cc", | 350 "common/nacl_paths.cc", |
| 286 "common/nacl_paths.h", | 351 "common/nacl_paths.h", |
| 287 ] | 352 ] |
| 288 | 353 |
| 289 defines = [ "__STDC_LIMIT_MACROS=1" ] | 354 defines = [ "__STDC_LIMIT_MACROS=1" ] |
| 290 } | 355 } |
| 291 } | 356 } |
| OLD | NEW |