diff options
| author | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 02:28:27 +0000 |
|---|---|---|
| committer | hbono@chromium.org <hbono@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-09-05 02:28:27 +0000 |
| commit | d4c59549ca9fdfc510462ef5a8fdca20526896f7 (patch) | |
| tree | 8a2a15725eedc01826149da3e0a57cdd2ae91cc5 /chrome/chrome_exe.gypi | |
| parent | 434976f03ea2ddc6dd338d11635ab850e82556ef (diff) | |
| download | chromium_src-d4c59549ca9fdfc510462ef5a8fdca20526896f7.zip chromium_src-d4c59549ca9fdfc510462ef5a8fdca20526896f7.tar.gz chromium_src-d4c59549ca9fdfc510462ef5a8fdca20526896f7.tar.bz2 | |
Revert 99617 - 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
TBR=bradchen@google.com
Review URL: http://codereview.chromium.org/7779029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@99619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
| -rw-r--r-- | chrome/chrome_exe.gypi | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index e5428dd..f028efd 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -453,12 +453,6 @@ '../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 |