From fc9e836200dfd6d40034783f25a26728219276ab Mon Sep 17 00:00:00 2001 From: dpranke Date: Thu, 7 May 2015 16:52:06 -0700 Subject: [PATCH] Fix building NaCl in Linux component GN builds. R=brettw@chromium.org, bbudge@chromium.org BUG=482415 Review URL: https://codereview.chromium.org/1119613002 Cr-Commit-Position: refs/heads/master@{#328882} --- build/config/features.gni | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/build/config/features.gni b/build/config/features.gni index 290c1d6d831f..387345827867 100644 --- a/build/config/features.gni +++ b/build/config/features.gni @@ -33,8 +33,7 @@ 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_component_build && - current_cpu == "x64") || is_nacl + enable_nacl = (is_linux && !is_chromeos && current_cpu == "x64") || is_nacl enable_nacl_untrusted = enable_nacl enable_pnacl = enable_nacl_untrusted -- 2.11.4.GIT