[NaCl SDK] Update Windows build to use vs2013 from depot_tools.

native_client_sdk/src/build_tools/build_artifacts.py

 #!/usr/bin/env python
 # Copyright 2014 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.
 
 """Script to build binary components of the SDK.
 
 This script builds binary components of the Native Client SDK, create tarballs
 for them, and uploads them to Google Cloud Storage.
 
@@ skipping 191 matching lines @@
 
 def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
   gyp_env = dict(os.environ)
   gyp_env['GYP_GENERATORS'] = 'ninja'
   gyp_defines = []
   if options.mac_sdk:
     gyp_defines.append('mac_sdk=%s' % options.mac_sdk)
   if arch:
     gyp_defines.append('target_arch=%s' % arch)
     if arch == 'arm':
-      if PLATFORM == 'linux':
-        gyp_env['CC'] = 'arm-linux-gnueabihf-gcc'
-        gyp_env['CXX'] = 'arm-linux-gnueabihf-g++'
-        gyp_env['AR'] = 'arm-linux-gnueabihf-ar'
-        gyp_env['AS'] = 'arm-linux-gnueabihf-as'
-        gyp_env['CC_host'] = 'cc'
-        gyp_env['CXX_host'] = 'c++'
-      gyp_defines += ['armv7=1', 'arm_thumb=0', 'arm_neon=1',
-                      'arm_float_abi=hard', 'nacl_enable_arm_gcc=1']
+      gyp_env['GYP_CROSSCOMPILE'] = '1'
+      gyp_defines += ['arm_float_abi=hard']
       if options.no_arm_trusted:
         gyp_defines.append('disable_cross_trusted=1')
   if PLATFORM == 'mac':
     gyp_defines.append('clang=1')
 
   gyp_env['GYP_DEFINES'] = ' '.join(gyp_defines)
   generator_flags = ['-G', 'output_dir=%s' % out_dir]
   depth = '--depth=.'
   cmd = [sys.executable, gyp_py_script, gyp_file, depth] + generator_flags
   buildbot_common.Run(cmd, cwd=SRC_DIR, env=gyp_env)
@@ skipping 120 matching lines @@
   else:
     toolchain = tcname
 
   tcpath = os.path.join(root, 'Release', 'gen', 'sdk', '%s_x86' % PLATFORM,
                         TOOLCHAIN_PACKAGE_MAP[toolchain])
   return GetToolchainNaClLib(tcname, tcpath, xarch)
 
 
 def MakeGypArchives():
   join = os.path.join
-  gyp_nacl = join(NACL_DIR, 'build', 'gyp_nacl')
   gyp_chromium = join(SRC_DIR, 'build', 'gyp_chromium')
+  # TODO(binji): gyp_nacl doesn't build properly on Windows anymore; it only
+  # can use VS2010, not VS2013 which is now required by the Chromium repo. NaCl
+  # needs to be updated to perform the same logic as Chromium in detecting VS,
+  # which can now exist in the depot_tools directory.
+  # See https://code.google.com/p/nativeclient/issues/detail?id=4022
+  #
+  # For now, let's use gyp_chromium to build these components.
+  # gyp_nacl = join(NACL_DIR, 'build', 'gyp_nacl')
+  gyp_nacl = gyp_chromium
+
   nacl_core_sdk_gyp = join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = join(NACL_DIR, 'build', 'all.gyp')
   breakpad_gyp = join(SRC_DIR, 'breakpad', 'breakpad.gyp')
   ppapi_gyp = join(SRC_DIR, 'ppapi', 'native_client', 'native_client.gyp')
   breakpad_targets = ['dump_syms', 'minidump_dump', 'minidump_stackwalk']
 
   # Build
   tmpdir_obj = TempDir('nacl_core_sdk_', dont_remove=True).Create()
   tmpdir = tmpdir_obj.name
   GypNinjaBuild('ia32', gyp_nacl, nacl_core_sdk_gyp, 'nacl_core_sdk', tmpdir)
@@ skipping 205 matching lines @@
   if options.upload:
     UploadArchives()
 
   return 0
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_artifacts: interrupted')