Build nacl_helper_nonsfi with GN

base/BUILD.gn

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import("//build/config/compiler/compiler.gni")
+import("//build/config/nacl/config.gni")
 import("//build/config/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 
 config("base_implementation") {
   defines = [ "BASE_IMPLEMENTATION" ]
 }
@@ skipping 648 matching lines @@
 
   data = []
 
   configs += [
     ":base_implementation",
     "//build/config:precompiled_headers",
   ]
 
   deps = [
     ":base_static",
-    "//base/allocator:allocator_extension_thunks",
-    "//base/third_party/dynamic_annotations",
-    "//third_party/modp_b64",
   ]
 
+  if (!is_nacl_nonsfi) {

[Dirk Pranke, 2015/10/21 20:03:52]

can you move these blocks next to the if (is_nacl) block on line 732 to try and
keep the nacl logic closer to being in one place?

[Petr Hosek, 2015/10/22 18:32:13]

Done.

+    deps += [
+      "//base/allocator:allocator_extension_thunks",
+      "//base/third_party/dynamic_annotations",
+      "//third_party/modp_b64",
+    ]
+  }
+
   public_deps = [
     ":base_paths",
-    "//base/debug",
-    "//base/json",
-    "//base/memory",
     "//base/metrics",
-    "//base/process",
     "//base/trace_event",
   ]
 
+  if (!is_nacl_nonsfi) {
+    public_deps += [
+      "//base/debug",
+      "//base/json",
+      "//base/memory",
+      "//base/process",
+    ]
+  }
+
   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos) {
     defines = [ "SYSTEM_NATIVE_UTF8" ]
   }
 
   if (is_android) {
     sources -= [ "power_monitor/power_monitor_device_source_posix.cc" ]
 
     # Android uses some Linux sources, put those back.
@@ skipping 227 matching lines @@
   if (is_asan || is_lsan || is_msan || is_tsan) {
     data += [ "//tools/valgrind/asan/" ]
     if (is_win) {
       data +=
           [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer.exe" ]
     } else {
       data += [ "//third_party/llvm-build/Release+Asserts/bin/llvm-symbolizer" ]
     }
   }
 
+  if (is_nacl_nonsfi) {

[Dirk Pranke, 2015/10/21 20:03:52]

can we move this up next to the if (is_nacl) block also and consolidate the
logic 
so that we only remove these files if (is_nacl && !is_nacl_nonsfi). It's
confusing
to add them, then remove them, then add them back.

[Petr Hosek, 2015/10/22 18:32:13]

Done.

+    set_sources_assignment_filter([])
+    sources += [
+      "files/file_util.cc",
+      "files/file_util_posix.cc",
+      "message_loop/message_pump_libevent.cc",
+      "message_loop/message_pump_libevent.h",
+      "posix/unix_domain_socket_linux.cc",
+      "process/kill_posix.cc",
+      "process/launch.h",
+      "process/launch_posix.cc",
+      "rand_util_posix.cc",
+    ]
+    set_sources_assignment_filter(sources_assignment_filter)
+    sources -= [
+      "allocator/allocator_extension.cc",
+      "allocator/allocator_extension.h",
+      "base64.cc",
+      "base64.h",
+      "rand_util_nacl.cc",
+    ]
+    deps += [ "//third_party/libevent" ]
+  }
+
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
   if (!is_debug) {
     configs -= [ "//build/config/compiler:default_optimization" ]
     configs += [ "//build/config/compiler:optimize_max" ]
   }
 
   allow_circular_includes_from = public_deps
 }
 
 # This is the subset of files from base that should not be used with a dynamic
@@ skipping 738 matching lines @@
 
   # GYP: //base.gyp:base_java_unittest_support
   android_library("base_java_unittest_support") {
     deps = [
       ":base_java",
     ]
     java_files =
         [ "test/android/java/src/org/chromium/base/ContentUriTestUtils.java" ]
   }
 }