Clean up deprecated sources assignment filter in //components/nacl

Remove deprecated_default_sources_assignment_filter and replace
it with explicit is_win, is_mac, etc. sections.

Bug: 1018739
Change-Id: I276656a5128181e9b5c93fc8c93df9fd5d255999
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2445416Reviewed-by: Derek Schuff <dschuff@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#814248}

components/nacl/browser/BUILD.gn

@@ -4,23 +4,12 @@
 
 import("//components/nacl/features.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 assert(enable_nacl)
 
 static_library("browser") {
   sources = [
     "bad_message.cc",
     "bad_message.h",
-    "nacl_broker_host_win.cc",
-    "nacl_broker_host_win.h",
-    "nacl_broker_service_win.cc",
-    "nacl_broker_service_win.h",
     "nacl_browser.cc",
     "nacl_browser.h",
     "nacl_file_host.cc",
@@ -60,6 +49,15 @@ static_library("browser") {
 
   data_deps = []
 
+  if (is_win) {
+    sources += [
+      "nacl_broker_host_win.cc",
+      "nacl_broker_host_win.h",
+      "nacl_broker_service_win.cc",
+      "nacl_broker_service_win.h",
+    ]
+  }
+
   if (is_linux || is_chromeos) {
     sources += [
       "../zygote/nacl_fork_delegate_linux.cc",

components/nacl/common/BUILD.gn

@@ -6,13 +6,6 @@ import("//build/buildflag_header.gni")
 import("//components/nacl/features.gni")
 import("//mojo/public/tools/bindings/mojom.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 if (enable_nacl) {
   # This is separate so it can be used by ../broker:nacl64.
   static_library("minimal") {
@@ -99,12 +92,16 @@ if (enable_nacl) {
   }
 
   source_set("debug_exception_handler") {
-    sources = [
-      "nacl_debug_exception_handler_win.cc",
-      "nacl_debug_exception_handler_win.h",
-    ]
+    sources = []
 
     deps = [ "//base" ]
+
+    if (is_win) {
+      sources += [
+        "nacl_debug_exception_handler_win.cc",
+        "nacl_debug_exception_handler_win.h",
+      ]
+    }
   }
 
   source_set("nacl_error_code") {

components/nacl/loader/BUILD.gn

@@ -8,13 +8,6 @@ import("//build/config/nacl/config.gni")
 import("//components/nacl/features.gni")
 import("//testing/test.gni")
 
-# This file depends on the legacy global sources assignment filter. It should
-# be converted to check target platform before assigning source files to the
-# sources variable. Remove this import and set_sources_assignment_filter call
-# when the file has been converted. See https://crbug.com/1018739 for details.
-import("//build/config/deprecated_default_sources_assignment_filter.gni")
-set_sources_assignment_filter(deprecated_default_sources_assignment_filter)
-
 assert(enable_nacl)
 
 # This is separate so it can be used by ../broker:nacl64.
@@ -26,9 +19,6 @@ source_set("minimal") {
     "nacl_listener.h",
     "nacl_main.cc",
     "nacl_main_platform_delegate.h",
-    "nacl_main_platform_delegate_linux.cc",
-    "nacl_main_platform_delegate_mac.mm",
-    "nacl_main_platform_delegate_win.cc",
     "nacl_trusted_listener.cc",
     "nacl_trusted_listener.h",
     "nacl_validation_db.h",
@@ -50,6 +40,18 @@ source_set("minimal") {
     "//sandbox",
     "//services/service_manager/public/cpp",
   ]
+
+  if (is_win) {
+    sources += [ "nacl_main_platform_delegate_win.cc" ]
+  }
+
+  if (is_mac) {
+    sources += [ "nacl_main_platform_delegate_mac.mm" ]
+  }
+
+  if (is_linux || is_chromeos) {
+    sources += [ "nacl_main_platform_delegate_linux.cc" ]
+  }
 }
 
 # This exists just to make 'gn check' happy with :minimal and
@@ -61,11 +63,14 @@ source_set("minimal_content_dummy") {
   sources = [
     "//content/public/common/main_function_params.h",
     "//content/public/common/sandbox_init.h",
-    "//content/public/common/zygote/sandbox_support_linux.h",
   ]
 
   # Deps required by the above headers.
   deps = [ "//media:media_buildflags" ]
+
+  if (is_linux || is_chromeos) {
+    sources += [ "//content/public/common/zygote/sandbox_support_linux.h" ]
+  }
 }
 
 source_set("loader") {
@@ -210,7 +215,6 @@ if (is_win && target_cpu == "x86" && current_cpu == "x64") {
 if (is_nacl_nonsfi) {
   executable("nacl_helper_nonsfi_nexe") {
     output_name = "nacl_helper_nonsfi"
-    set_sources_assignment_filter([])
     sources = [
       "nacl_helper_linux.cc",
       "nacl_helper_linux.h",
@@ -247,7 +251,6 @@ if (is_nacl_nonsfi) {
   }
 
   source_set("nacl_helper_nonsfi_sandbox") {
-    set_sources_assignment_filter([])
     sources = [
       "nonsfi/nonsfi_sandbox.cc",
       "nonsfi/nonsfi_sandbox.h",