Index: components/nacl/loader/BUILD.gn |
diff --git a/components/nacl/loader/BUILD.gn b/components/nacl/loader/BUILD.gn |
index cef8842020d8c8c48b5cae9b8b9e163318f0b60e..bf15385b43920f0a3eefe1943682859c19f6b85c 100644 |
--- a/components/nacl/loader/BUILD.gn |
+++ b/components/nacl/loader/BUILD.gn |
@@ -4,6 +4,7 @@ |
import("//build/config/features.gni") |
import("//build/config/nacl/config.gni") |
+import("//services/service_manager/public/service_manifest.gni") |
import("//testing/test.gni") |
assert(enable_nacl) |
@@ -38,6 +39,7 @@ source_set("minimal") { |
"//ppapi/c", |
"//ppapi/proxy:ipc", |
"//sandbox", |
+ "//services/service_manager/public/cpp", |
] |
} |
@@ -49,10 +51,7 @@ source_set("minimal_content_dummy") { |
check_includes = false |
sources = [ |
"//content/public/common/child_process_sandbox_support_linux.h", |
- "//content/public/common/content_descriptors.h", |
- "//content/public/common/content_switches.h", |
"//content/public/common/main_function_params.h", |
- "//content/public/common/mojo_channel_switches.h", |
"//content/public/common/sandbox_init.h", |
] |
} |
@@ -65,9 +64,11 @@ source_set("loader") { |
"//components/nacl/common", |
"//content/public/common", |
"//ppapi/shared_impl", |
+ "//services/service_manager/public/cpp", |
] |
data_deps = [ |
+ ":nacl_loader_manifest", |
"//ppapi/native_client:irt", |
"//ppapi/native_client/src/untrusted/pnacl_support_extension", |
] |
@@ -191,12 +192,6 @@ if (is_nacl_nonsfi) { |
set_sources_assignment_filter([]) |
sources = [ |
# TODO(brettw) can this just depend on //components/nacl/common? |
- "../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", |
"nacl_helper_linux.cc", |
"nacl_helper_linux.h", |
"nacl_trusted_listener.cc", |
@@ -209,6 +204,7 @@ if (is_nacl_nonsfi) { |
deps = [ |
":nacl_helper_nonsfi_sandbox", |
"//base", |
+ "//components/nacl/common:minimal", |
"//components/nacl/common:switches", |
"//components/tracing", |
"//content", |
@@ -225,6 +221,7 @@ if (is_nacl_nonsfi) { |
"//native_client/src/untrusted/nacl", |
"//ppapi/proxy", |
"//sandbox/linux:sandbox", |
+ "//services/service_manager/public/cpp", |
] |
} |
@@ -238,6 +235,7 @@ if (is_nacl_nonsfi) { |
] |
deps = [ |
"//base", |
+ "//components/nacl/common:minimal", |
"//components/nacl/common:switches", |
"//content", |
"//sandbox/linux:sandbox", |
@@ -290,3 +288,8 @@ if (is_nacl_nonsfi) { |
] |
} |
} |
+ |
+service_manifest("nacl_loader_manifest") { |
+ name = "nacl_loader" |
+ source = "nacl_loader_manifest.json" |
+} |