diff options
author | mcgrathr <mcgrathr@chromium.org> | 2015-11-11 19:14:03 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-11-12 03:15:34 +0000 |
commit | aac646a4593a4786d230b62e86f60f3fcf952854 (patch) | |
tree | f6e8f8e4b386cb92abeebf96bde89c45e9031132 | |
parent | 77a2975abb0892c2c2b22f86028619cf6d70f949 (diff) | |
download | chromium_src-aac646a4593a4786d230b62e86f60f3fcf952854.zip chromium_src-aac646a4593a4786d230b62e86f60f3fcf952854.tar.gz chromium_src-aac646a4593a4786d230b62e86f60f3fcf952854.tar.bz2 |
GN: Enable NaCl on Mac
The GN build with NaCl enabled works on Mac now.
BUG= 545236
CQ_EXTRA_TRYBOTS=tryserver.chromium.mac:mac_chromium_gn_dbg,mac_chromium_gn_rel,mac_chromium_gn_upload
R=dpranke@chromium.org
Review URL: https://codereview.chromium.org/1434873005
Cr-Commit-Position: refs/heads/master@{#359224}
-rw-r--r-- | build/config/features.gni | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build/config/features.gni b/build/config/features.gni index 669ad5d..d8ddb47 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -39,7 +39,7 @@ declare_args() { # the commented out logic. # Eventually we want this to be: # enable_nacl = !is_ios && !is_android && !is_chromecast - enable_nacl = ((is_linux && !is_chromeos) || is_nacl) && + enable_nacl = (is_mac || (is_linux && !is_chromeos) || is_nacl) && current_cpu != "mipsel" && !is_chromecast enable_nacl_untrusted = enable_nacl enable_pnacl = enable_nacl_untrusted |