Land prep work to enable NaCl in the Linux x64 GN builds.

base/BUILD.gn

Index: base/BUILD.gn
diff --git a/base/BUILD.gn b/base/BUILD.gn
index 9b5e471187f52a5e1d71398486579f2042c4cea1..c65e523245b1c1ccdcc8fe7da0a80a1ed35c462f 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -764,7 +764,29 @@ component("base") {
   ]
 
   if (is_nacl) {
-    sources += [ "files/file_path_watcher_stub.cc" ]
+    # We reset sources_assignment_filter in order to explicitly include
+    # the linux file (which would otherwise be filtered out).
+    set_sources_assignment_filter([])
+    sources += [
+      "files/file_path_watcher_stub.cc",
+      "sync_socket_nacl.cc",
+      "threading/platform_thread_linux.cc",
+    ]
+    set_sources_assignment_filter(sources_assignment_filter)
+
+    sources -= [
+      "allocator/type_profiler_control.cc",
+      "allocator/type_profiler_control.h",
+      "async_socket_io_handler_posix.cc",
+      "base_paths.cc",
+      "cpu.cc",
+      "files/file_proxy.cc",
+      "files/file_util.cc",
+      "files/file_util_proxy.cc",
+      "path_service.cc",
+      "scoped_native_library.cc",
+      "files/scoped_temp_dir.cc",
+    ]
   }
 
   sources -= [
@@ -783,11 +805,14 @@ component("base") {
   deps = [
     ":base_static",
     "//base/allocator:allocator_extension_thunks",
-    "//base/third_party/dynamic_annotations",
     "//base/third_party/nspr",
     "//third_party/modp_b64",
   ]
 
+  if (!is_nacl) {
+    deps += [ "//base/third_party/dynamic_annotations" ]

[brettw, 2015/02/25 21:27:29]

Does dynamic_annotations ever make sense in nacl? If not, I think we should have
an if in base that maps it to an empty group in nacl so we don't need these
conditions.

[Dirk Pranke, 2015/02/25 21:37:40]

I don't think so; from what I could tell, we never build dynamic_annotations in
nacl in the GYP builds. will change.

+  }
+
   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos) {
@@ -852,6 +877,7 @@ component("base") {
       "process/launch_posix.cc",
       "process/process_metrics_posix.cc",
       "process/process_posix.cc",
+      "rand_util_posix.cc",
       "sync_socket_posix.cc",
       "sys_info_posix.cc",
     ]
@@ -1027,10 +1053,13 @@ component("i18n") {
   configs += [ "//build/config/compiler:wexit_time_destructors" ]
   deps = [
     ":base",
-    "//base/third_party/dynamic_annotations",
     "//third_party/icu",
   ]
 
+  if (!is_nacl) {
+    deps += [ "//base/third_party/dynamic_annotations" ]

[brettw, 2015/02/25 21:27:29]

Ditto

+  }
+
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]