Chromium Code Reviews| Index: content/BUILD.gn |
| diff --git a/content/BUILD.gn b/content/BUILD.gn |
| index d9c1999a5baa4ac61198a260579e840f414dd968..23d741340f74767d58cb62d1b6a670a7e6d65cd4 100644 |
| --- a/content/BUILD.gn |
| +++ b/content/BUILD.gn |
| @@ -3,6 +3,7 @@ |
| # found in the LICENSE file. |
| import("//tools/grit/grit_rule.gni") |
| +import("//build/config/nacl/config.gni") |
| # Applied by targets internal to content. |
| config("content_implementation") { |
| @@ -37,18 +38,21 @@ config("content_implementation") { |
| # targets make sure the dependency goes through the content shared library |
| # when doing a component build). |
| -content_shared_components = [ |
| - "//content/gpu:gpu_sources", |
| - "//content/public/browser:browser_sources", |
| - "//content/public/child:child_sources", |
| - "//content/public/common:common_sources", |
| - "//content/public/plugin:plugin_sources", |
| - "//content/public/renderer:renderer_sources", |
| - "//content/public/utility:utility_sources", |
| -] |
| +if (!is_nacl_nonsfi) { |
| + content_shared_components = [ |
| + "//content/gpu:gpu_sources", |
| + "//content/public/browser:browser_sources", |
| + "//content/public/child:child_sources", |
| + "//content/public/common:common_sources", |
| + "//content/public/plugin:plugin_sources", |
| + "//content/public/renderer:renderer_sources", |
| + "//content/public/utility:utility_sources", |
| + ] |
| -if (enable_plugins) { |
| - content_shared_components += [ "//content/ppapi_plugin:ppapi_plugin_sources" ] |
| + if (enable_plugins) { |
| + content_shared_components += |
| + [ "//content/ppapi_plugin:ppapi_plugin_sources" ] |
| + } |
| } |
| if (is_component_build) { |
| @@ -59,6 +63,23 @@ if (is_component_build) { |
| "//build/config/sanitizers:deps", |
| ] |
| } |
| +} else if (is_nacl_nonsfi) { |
|
Dirk Pranke
2015/10/21 20:03:52
there's a part of content that's built w/ the nacl
Petr Hosek
2015/10/22 18:32:13
Done. Why we build only a subset of content is a q
|
| + static_library("content") { |
| + set_sources_assignment_filter([]) |
| + sources = [ |
| + "common/sandbox_linux/sandbox_init_linux.cc", |
| + "common/sandbox_linux/sandbox_seccomp_bpf_linux.cc", |
| + "common/send_zygote_child_ping_linux.cc", |
| + "public/common/content_switches.cc", |
| + ] |
| + set_sources_assignment_filter(sources_assignment_filter) |
| + |
| + defines = [ "USE_SECCOMP_BPF=1" ] |
| + |
| + deps = [ |
| + "//base", |
| + ] |
| + } |
| } else { |
| group("content") { |
| deps = content_shared_components |