diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 05:18:26 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 05:18:26 +0000 |
| commit | b5281450170938c08da6b64ced2438db297f2db6 (patch) | |
| tree | b517b7898bbfb379665d4d1b96b48047bf3d3957 /chrome/chrome_exe.gypi | |
| parent | 7a70947e686305901b234f1a65786c80ceca6395 (diff) | |
| download | chromium_src-b5281450170938c08da6b64ced2438db297f2db6.zip chromium_src-b5281450170938c08da6b64ced2438db297f2db6.tar.gz chromium_src-b5281450170938c08da6b64ced2438db297f2db6.tar.bz2 | |
Fix nacl_helper argv bug, re-enable nacl_helper, build on linux except ARM. Previously reviewed as http://codereview.chromium.org/7833017; this time ARM build is disabled.
TBR=mcgrathr,mseaborn,evanm
BUG=92964,nativeclient:480,95196
TEST=nacl_integration on linux
Review URL: http://codereview.chromium.org/7800026
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99622 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index f028efd..8207d80 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 |