[linux] remove dependency between nacl_helper and media

content/common/BUILD.gn

Index: content/common/BUILD.gn
diff --git a/content/common/BUILD.gn b/content/common/BUILD.gn
index 7b5db9e46e170d838320144a8cbb1fa8abb247c6..db48da39178f9ef964018797e326c585f56dcee2 100644
--- a/content/common/BUILD.gn
+++ b/content/common/BUILD.gn
@@ -224,6 +224,77 @@ source_set("common") {
   }
 }
 
+if (is_linux) {
+  # This target contains sources from //content/common needed by nacl_helper.
+  # It does not depend on //media/ffmpeg unlike //content/common.
+  # So nacl_helper executable does not crash when cannot find libbffmpeg.so.
+  source_set("sandbox_linux") {
+    sources = [
+      "//content/public/common/child_process_sandbox_support_linux.h",

[Mark Seaborn, 2016/09/08 20:46:55]

I'm afraid this is still duplicating more than I am comfortable with.  I
wouldn't want to give other people the burden of maintaining this.

Does my suggestion in https://crbug.com/642306 work for you instead?

+      "//content/public/common/sandbox_init.h",
+      "//content/public/common/sandbox_linux.h",
+      "//content/public/common/sandbox_type.h",
+      "//content/public/common/send_zygote_child_ping_linux.h",
+      "//content/public/common/zygote_fork_delegate_linux.h",
+      "child_process_sandbox_support_impl_linux.cc",
+      "child_process_sandbox_support_impl_linux.h",
+      "child_process_sandbox_support_impl_shm_linux.cc",
+      "content_export.h",
+      "sandbox_linux/sandbox_debug_handling_linux.cc",
+      "sandbox_linux/sandbox_debug_handling_linux.h",
+      "sandbox_linux/sandbox_init_linux.cc",
+      "sandbox_linux/sandbox_linux.cc",
+      "sandbox_linux/sandbox_linux.h",
+      "send_zygote_child_ping_linux.cc",
+      "set_process_title.cc",
+      "set_process_title.h",
+      "set_process_title_linux.cc",
+      "set_process_title_linux.h",
+      "zygote_commands_linux.h",
+    ]
+    deps = [
+      "//base",
+      "//content/public/common:content_descriptors",
+      "//content/public/common:static_switches",
+      "//ipc:ipc",
+      "//ppapi/c:c",
+      "//sandbox/linux:sandbox_services",
+      "//sandbox/linux:suid_sandbox_client",
+      "//third_party/WebKit/public:blink_headers",
+      "//third_party/WebKit/public:blink_minimal",
+    ]
+    if (use_seccomp_bpf) {
+      defines = [ "USE_SECCOMP_BPF" ]
+      sources += [
+        "sandbox_linux/bpf_cros_arm_gpu_policy_linux.cc",
+        "sandbox_linux/bpf_cros_arm_gpu_policy_linux.h",
+        "sandbox_linux/bpf_gpu_policy_linux.cc",
+        "sandbox_linux/bpf_gpu_policy_linux.h",
+        "sandbox_linux/bpf_ppapi_policy_linux.cc",
+        "sandbox_linux/bpf_ppapi_policy_linux.h",
+        "sandbox_linux/bpf_renderer_policy_linux.cc",
+        "sandbox_linux/bpf_renderer_policy_linux.h",
+        "sandbox_linux/bpf_utility_policy_linux.cc",
+        "sandbox_linux/bpf_utility_policy_linux.h",
+        "sandbox_linux/sandbox_bpf_base_policy_linux.cc",
+        "sandbox_linux/sandbox_bpf_base_policy_linux.h",
+        "sandbox_linux/sandbox_seccomp_bpf_linux.cc",
+        "sandbox_linux/sandbox_seccomp_bpf_linux.h",
+      ]
+      deps += [
+        "//sandbox/linux:seccomp_bpf",
+        "//ui/gl:switches",
+      ]
+      if (is_android) {
+        sources += [
+          "sandbox_linux/android/sandbox_bpf_base_policy_android.cc",
+          "sandbox_linux/android/sandbox_bpf_base_policy_android.h",
+        ]
+      }
+    }
+  }
+}
+
 # See comment at the top of //content/BUILD.gn for how this works.
 group("for_content_tests") {
   visibility = [ "//content/test/*" ]