Index: build/config/features.gni |
diff --git a/build/config/features.gni b/build/config/features.gni |
index 3811e27cfe733ec6c41fd70006015cd729ac69bf..c7fb78f4e0b07ba700da5fefa3d1d1a44c7e9b7b 100644 |
--- a/build/config/features.gni |
+++ b/build/config/features.gni |
@@ -22,9 +22,18 @@ 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(GYP): Get NaCl linking on other platforms. |
+ # Also, see if we can always get rid of enable_nacl_untrusted and |
+ # enable_pnacl and always build them if enable_nacl is true. |
+ # The "is_nacl" part of the condition is needed to ensure that |
+ # the untrusted code is built properly; arguably it should be |
+ # guarded by "is_nacl" directly rather than enable_nacl_untrusted, but |
+ # this will go away when Mac and Win are working and we can just use |
+ # the commented out logic. |
+ # enable_nacl = !is_ios && !is_android |
+ enable_nacl = (is_linux && build_cpu_arch == "x86") || is_nacl |
+ 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 |