| Index: chrome/chrome_exe.gypi
|
| diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi
|
| index f028efd8dce828e3930db0da38fb7049dc89b011..f292fad63a537aa34ea8013959fa183185154bc7 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 or when disable_nacl=1
|
| + ['disable_nacl!=1 and 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
|
|
|