diff options
| author | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 01:17:48 +0000 |
|---|---|---|
| committer | bradchen@google.com <bradchen@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 01:17:48 +0000 |
| commit | 434976f03ea2ddc6dd338d11635ab850e82556ef (patch) | |
| tree | d280cadf645b1c7a346e3f6a3192890274dfae1a /chrome/chrome_exe.gypi | |
| parent | 507ffdf6079782560d84150c156c2c7f8e23e2f9 (diff) | |
| download | chromium_src-434976f03ea2ddc6dd338d11635ab850e82556ef.zip chromium_src-434976f03ea2ddc6dd338d11635ab850e82556ef.tar.gz chromium_src-434976f03ea2ddc6dd338d11635ab850e82556ef.tar.bz2 | |
Fix nacl_helper startup bug with command line construction.
Add proper chrome dependencies. Re-enable nacl_helper.
BUG=92964,nativeclient:480,95168
TEST=nacl_integration tests on bots
Review URL: http://codereview.chromium.org/7833017
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99617 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index f028efd..e5428dd 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -453,6 +453,12 @@ '../third_party/adobe/flash/flash_player.gyp:flash_player', ], }], + ['OS=="linux"', { + 'dependencies': [ + 'nacl_helper_bootstrap', + 'nacl_helper', + ], + }], ['OS=="mac"', { 'dependencies': [ # On Mac, make sure we've built chrome_dll, which contains all of |