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 43f92f501937244a55ceb6f24208d285ca0926bd..81a3c8cebe568a9298ae725ecea4e0337e98017a 100644
--- a/base/BUILD.gn
+++ b/base/BUILD.gn
@@ -756,7 +756,27 @@ component("base") {
   ]
 
   if (is_nacl) {
-    sources += [ "files/file_path_watcher_stub.cc" ]
+    set_sources_assignment_filter([])

[Nick Bray (chromium), 2015/02/05 23:21:45]

Why?  Comment.

[Dirk Pranke, 2015/02/05 23:52:19]

I will add a comment, but we need to include the _linux file that
sources_assignment_filter will otherwise strip out when is_nacl is true.

+    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 -= [
@@ -775,11 +795,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" ]

[Nick Bray (chromium), 2015/02/05 23:21:45]

Nit: comment why?

[Dirk Pranke, 2015/02/05 23:52:19]

I'm not sure what I would say in a comment here; we don't use dynamic_annotation
in a nacl build, which is pretty much what that says ... Would you want
something saying *why* we don't use dynamic_annotations? (I don't actually know
the reason, but I can find out).

+  }
+
   # Allow more direct string conversions on platforms with native utf8
   # strings
   if (is_mac || is_ios || is_chromeos) {
@@ -836,14 +859,15 @@ component("base") {
       "debug/stack_trace_posix.cc",
       "files/file_enumerator_posix.cc",
       "files/file_util_posix.cc",
+      "memory/shared_memory_posix.cc",
       "message_loop/message_pump_libevent.cc",
+      "metrics/field_trial.cc",
+      "native_library_posix.cc",
       "process/kill_posix.cc",
       "process/launch_posix.cc",
       "process/process_metrics_posix.cc",
       "process/process_posix.cc",
-      "metrics/field_trial.cc",
-      "native_library_posix.cc",
-      "memory/shared_memory_posix.cc",
+      "rand_util_posix.cc",
       "sync_socket_posix.cc",
       "sys_info_posix.cc",
     ]
@@ -1019,10 +1043,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" ]
+  }
+
   if (is_android && !is_debug) {
     configs -= [ "//build/config/compiler:optimize" ]
     configs += [ "//build/config/compiler:optimize_max" ]