Index: build/config/features.gni |
diff --git a/build/config/features.gni b/build/config/features.gni |
index d143dac4b89ce082835f225866a0e9f164ccc019..7bb8b6397cb30b9953c63fa32cbcb440b5f70ab6 100644 |
--- a/build/config/features.gni |
+++ b/build/config/features.gni |
@@ -22,10 +22,12 @@ if (is_android) { |
declare_args() { |
# Enables Native Client support. |
- # Temporarily disable nacl on arm64 linux to get rid of compilation errors. |
+ # Temporarily disable nacl on arm64 linux, ppc64 and s390x |
brettw
2017/04/26 20:07:42
I thought the changes you're doing is to support V
rayb
2017/04/27 19:29:45
Hmm, I see what you mean. Since IIUC, I shouldn't
brettw
2017/04/27 20:45:52
I don't quite follow.
build/config/compiler/BUILD
|
+ # to get rid of compilation errors. |
# TODO(mcgrathr): When mipsel-nacl-clang is available, drop the exclusion. |
- enable_nacl = !is_ios && !is_android && !is_chromecast && |
- current_cpu != "mipsel" && !(is_linux && target_cpu == "arm64") |
+ enable_nacl = |
+ !is_ios && !is_android && !is_chromecast && current_cpu != "mipsel" && |
+ !(is_linux && target_cpu == "arm64") && !is_power_or_z |
# Non-SFI is not yet supported on mipsel |
enable_nacl_nonsfi = current_cpu != "mipsel" |