| Index: components/nacl/BUILD.gn
|
| diff --git a/components/nacl/BUILD.gn b/components/nacl/BUILD.gn
|
| index 1284792c466b620642c5412a92eea3c9e4674b9e..7e46ef65cadad54590d96361700116b0bf5f886d 100644
|
| --- a/components/nacl/BUILD.gn
|
| +++ b/components/nacl/BUILD.gn
|
| @@ -39,6 +39,7 @@ if (enable_nacl) {
|
| "//ppapi/proxy:ipc",
|
| "//ppapi/shared_impl",
|
| "//third_party/mojo/src/mojo/edk/embedder",
|
| +
|
| # TODO(use_chrome_edk): so that EDK in third_party can choose the EDK in
|
| # src/mojo if the command line flag is specified. It has to since we can
|
| # only have one definition of the Mojo primitives.
|
| @@ -46,7 +47,9 @@ if (enable_nacl) {
|
| ]
|
|
|
| if (enable_nacl_untrusted) {
|
| - data_deps = [ "//ppapi/native_client:irt" ]
|
| + data_deps = [
|
| + "//ppapi/native_client:irt",
|
| + ]
|
| }
|
| if (enable_pnacl) {
|
| data_deps +=
|
| @@ -264,11 +267,77 @@ if (enable_nacl) {
|
| }
|
| }
|
| }
|
| +
|
| + if (is_nacl) {
|
| + executable("nacl_helper_nonsfi") {
|
| + set_sources_assignment_filter([])
|
| + sources = [
|
| + "common/nacl_messages.cc",
|
| + "common/nacl_messages.h",
|
| + "common/nacl_types.cc",
|
| + "common/nacl_types.h",
|
| + "common/nacl_types_param_traits.cc",
|
| + "common/nacl_types_param_traits.h",
|
| + "loader/nacl_helper_linux.cc",
|
| + "loader/nacl_helper_linux.h",
|
| + "loader/nacl_trusted_listener.cc",
|
| + "loader/nacl_trusted_listener.h",
|
| + "loader/nonsfi/nonsfi_listener.cc",
|
| + "loader/nonsfi/nonsfi_listener.h",
|
| + "loader/nonsfi/nonsfi_main.cc",
|
| + "loader/nonsfi/nonsfi_main.h",
|
| + ]
|
| + set_sources_assignment_filter(sources_assignment_filter)
|
| + ldflags = [
|
| + "-Wl,--noirt",
|
| + "-Wt,--noirt",
|
| + "-Wt,--noirtshim",
|
| + "-nodefaultlibs",
|
| + ]
|
| + libs = [
|
| + "c++",
|
| + "m",
|
| + "c",
|
| + "pnaclmm",
|
| + ]
|
| + deps = [
|
| + ":nacl_switches",
|
| + ":nacl_helper_nonsfi_sandbox",
|
| + "//base",
|
| + "//components/tracing",
|
| + "//content",
|
| + "//ipc",
|
| + "//native_client/src/nonsfi/irt:nacl_sys_private",
|
| + "//native_client/src/nonsfi/loader:elf_loader",
|
| + "//native_client/src/untrusted/nacl:nacl",
|
| + "//ppapi/proxy",
|
| + "//sandbox/linux:sandbox_linux_nacl_nonsfi",
|
| + ]
|
| + }
|
| +
|
| + source_set("nacl_helper_nonsfi_sandbox") {
|
| + set_sources_assignment_filter([])
|
| + sources = [
|
| + "loader/nonsfi/nonsfi_sandbox.cc",
|
| + "loader/nonsfi/nonsfi_sandbox.h",
|
| + "loader/sandbox_linux/nacl_sandbox_linux.cc",
|
| + "loader/sandbox_linux/nacl_sandbox_linux.h",
|
| + ]
|
| + set_sources_assignment_filter(sources_assignment_filter)
|
| + deps = [
|
| + "//base",
|
| + "//content",
|
| + "//sandbox/linux:sandbox_linux_nacl_nonsfi",
|
| + ]
|
| + }
|
| + }
|
| } else {
|
| group("nacl") {
|
| }
|
| group("nacl_helper") {
|
| }
|
| + group("nacl_helper_nonsfi") {
|
| + }
|
| }
|
|
|
| source_set("nacl_switches") {
|
|
|