Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(85)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: chrome/chrome_exe.gypi

Issue 8352025: Move the definition of disable_nacl% inside a conditional (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_exe.gypi
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
index a809fee7a981b957c142578de93593a216290a76..e148e55c014a4ff5d1d2f950cce97e3e5f8e5a67 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -410,8 +410,8 @@
}],
['OS=="linux"', {
'conditions': [
- # For now, do not build nacl_helper on ARM or when disable_nacl=1
- ['disable_nacl!=1 and target_arch!="arm"', {
+ # For now, do not build nacl_helper when disable_nacl=1
+ ['disable_nacl!=1', {
'dependencies': [
'nacl_helper_bootstrap',
'nacl_helper',
« no previous file with comments | « build/common.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698