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

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/ui.gni")
 import("//testing/test.gni")
 
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
@@ skipping 746 matching lines @@
     "win/startup_information.h",
     "win/win_util.cc",
     "win/win_util.h",
     "win/windows_version.cc",
     "win/windows_version.h",
     "win/wrapped_window_proc.cc",
     "win/wrapped_window_proc.h",
   ]
 
   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 -= [
     "process/process_handle_freebsd.cc",
     "process/process_handle_openbsd.cc",
     "process/process_iterator_freebsd.cc",
     "process/process_iterator_openbsd.cc",
     "process/process_metrics_freebsd.cc",
     "process/process_metrics_openbsd.cc",
     "sys_info_freebsd.cc",
     "sys_info_openbsd.cc",
   ]
 
   defines = [ "BASE_IMPLEMENTATION" ]
 
   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) {
     defines += [ "SYSTEM_NATIVE_UTF8" ]
   }
 
   if (is_android) {
     sources += [
       "memory/discardable_memory_ashmem.cc",
       "memory/discardable_memory_ashmem.h",
@@ skipping 44 matching lines @@
       "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",
+      "rand_util_posix.cc",
       "sync_socket_posix.cc",
       "sys_info_posix.cc",
     ]
   } else {
     # Remove nacl stuff.
     sources -= [
       "memory/shared_memory_nacl.cc",
       "os_compat_nacl.cc",
       "os_compat_nacl.h",
       "rand_util_nacl.cc",
@@ skipping 155 matching lines @@
     "i18n/time_formatting.h",
     "i18n/timezone.cc",
     "i18n/timezone.h",
     "i18n/utf8_validator_tables.cc",
     "i18n/utf8_validator_tables.h",
   ]
   defines = [ "BASE_I18N_IMPLEMENTATION" ]
   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" ]
   }
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
 }
 
 source_set("prefs") {
@@ skipping 503 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" ]
   }
 }