Merge 236644 "[NaCl SDK] Turn off parallel GYP when building nac..."

native_client_sdk/src/build_tools/build_sdk.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Entry point for both build and try bots.
 
 This script is invoked from XXX, usually without arguments
 to package an SDK. It automatically determines whether
 this SDK is for mac, win, linux.
@@ skipping 529 matching lines @@
       gyp_defines += ['armv7=1', 'arm_thumb=0', 'arm_neon=1']
       if force_arm_gcc:
         gyp_defines += ['nacl_enable_arm_gcc=1']
 
   gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines)
   for key in ['GYP_GENERATORS', 'GYP_DEFINES']:
     value = gyp_env[key]
     print '%s="%s"' % (key, value)
   gyp_generator_flags = ['-G', 'output_dir=%s' % (out_dir,)]
   gyp_depth = '--depth=.'
-  buildbot_common.Run(
-      [sys.executable, gyp_py_script, gyp_file, gyp_depth] + \
-          gyp_generator_flags,
-      cwd=SRC_DIR,
-      env=gyp_env)
+  cmd = [sys.executable, gyp_py_script, gyp_file, gyp_depth]
+  # Hack added to fix M32 branch windows_sdk_multirel bot, without having to
+  # branch the native_client repo.
+  # TODO(binji): remove after I drover the change to 1700 branch.
+  cmd.append('--no-parallel')
+  cmd.extend(gyp_generator_flags)
+  buildbot_common.Run(cmd, cwd=SRC_DIR, env=gyp_env)
   NinjaBuild(targets, out_dir)
 
 
 def NinjaBuild(targets, out_dir):
   if type(targets) is not list:
     targets = [targets]
   out_config_dir = os.path.join(out_dir, 'Release')
   buildbot_common.Run(['ninja', '-C', out_config_dir] + targets, cwd=SRC_DIR)
 
 
@@ skipping 414 matching lines @@
     BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')