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

Unified Diff: chrome/chrome_exe.gypi

Issue 7800026: Fix nacl_helper argv bug, re-enable, build on linux except ARM (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | 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 f028efd8dce828e3930db0da38fb7049dc89b011..8207d8082e10d05cdc3141927eaf193514512e8e 100644
--- a/chrome/chrome_exe.gypi
+++ b/chrome/chrome_exe.gypi
@@ -453,6 +453,17 @@
'../third_party/adobe/flash/flash_player.gyp:flash_player',
],
}],
+ ['OS=="linux"', {
+ 'conditions': [
+ # For now, do not build nacl_helper on ARM
+ ['target_arch!="arm"', {
+ 'dependencies': [
+ 'nacl_helper_bootstrap',
+ 'nacl_helper',
+ ],
+ }],
+ ],
+ }],
['OS=="mac"', {
'dependencies': [
# On Mac, make sure we've built chrome_dll, which contains all of
« no previous file with comments | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698