From 9d95761a246f85b547445a0c0b120df84f37a9f7 Mon Sep 17 00:00:00 2001 From: dpranke Date: Wed, 29 Apr 2015 16:00:00 -0700 Subject: [PATCH] Disable Nacl on Linux GN component builds. This is a temporary workaround until the other fixes for bug 482415 can land. This shouldn't affect any of the bots, as the only component GN Linux build we have is also a debug build, so NaCl was already disabled. TBR=brettw@chromium.org, bbudge@chromium.org BUG=482415 Review URL: https://codereview.chromium.org/1104303003 Cr-Original-Commit-Position: refs/heads/master@{#327604} Cr-Mirrored-From: https://chromium.googlesource.com/chromium/src Cr-Mirrored-Commit: 1feead57e3a71bbdad4775899b19d0b173ffc7e7 --- config/features.gni | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/config/features.gni b/config/features.gni index dd7b0819b..3f6377376 100644 --- a/config/features.gni +++ b/config/features.gni @@ -32,8 +32,8 @@ declare_args() { # the commented out logic. # Eventually we want this to be: # enable_nacl = !is_ios && !is_android - enable_nacl = - (is_linux && !is_chromeos && !is_debug && current_cpu == "x64") || is_nacl + enable_nacl = (is_linux && !is_chromeos && !is_component_build && + current_cpu == "x64") || is_nacl enable_nacl_untrusted = enable_nacl enable_pnacl = enable_nacl_untrusted