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

build/config/features.gni

Index: build/config/features.gni
diff --git a/build/config/features.gni b/build/config/features.gni
index 3811e27cfe733ec6c41fd70006015cd729ac69bf..906fe8a5a46cb047f100382d22c163624af07909 100644
--- a/build/config/features.gni
+++ b/build/config/features.gni
@@ -22,9 +22,13 @@ declare_args() {
   enable_plugins = !is_android && !is_ios
 
   # Enables Native Client support.
-  # TODO(GYP) enable this when nacl works in GN.
-  enable_nacl = false
-  #enable_nacl = (!is_ios && !is_android)
+  # TODO(dpranke): Get NaCl linking on Mac and Win as well.
+  # Also, see if we can always get rid of enable_nacl_untrusted and
+  # enable_pnacl and always build them if enable_nacl is true.
+  # enable_nacl = !is_ios && !is_android
+  enable_nacl = is_linux || is_nacl

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

Nit: it seems strange is_nacl is needed.  Why?

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

Because a lot of the conditions are if (enable_nacl && enable_nacl_untrusted).
When os=="nacl" (which is where you want most of the untrusted code compiled),
this would otherwise be false.

I can add a comment to that extent.

It might be better to have much of the code protected by if
(enable_nacl_untrusted) to actually be if (is_nacl), but that would diverge more
from how we did things in GYP.

+  enable_nacl_untrusted = enable_nacl
+  enable_pnacl = true
 
   # If debug_devtools is set to true, JavaScript files for DevTools are stored
   # as is and loaded from disk. Otherwise, a concatenated file is stored in