Merge 100031 - Modify the build recipe for nacl_helper_bootstrap to invoke the linker explicitly ...

chrome/chrome_exe.gypi

 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'target_defaults': {
     'variables': {
       'chrome_exe_target': 0,
     },
     'target_conditions': [
@@ skipping 434 matching lines @@
           ],
           'dependencies': [
             'packed_extra_resources',
             'packed_resources',
             # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
             # file decide what to do on a per-OS basis; on Mac, internal plugins
             # go inside the framework, so this dependency is in chrome_dll.gypi.
             '../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
             # the library code with Chromium functionality.
             'chrome_dll',
           ],
         }],
         ['OS=="win"', {
           'conditions': [
             ['optimize_with_syzygy==1', {
@@ skipping 76 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }