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

native_client_sdk/src/build_tools/build_artifacts.py

Index: native_client_sdk/src/build_tools/build_artifacts.py
diff --git a/native_client_sdk/src/build_tools/build_artifacts.py b/native_client_sdk/src/build_tools/build_artifacts.py
index 1a9f0d8a6862cec6e85453b2b429db8c8898a8ea..8c4a09c0e682d7c1eed91634096139e20a15185a 100755
--- a/native_client_sdk/src/build_tools/build_artifacts.py
+++ b/native_client_sdk/src/build_tools/build_artifacts.py
@@ -209,15 +209,8 @@ def GypNinjaBuild(arch, gyp_py_script, gyp_file, targets, out_dir):
   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':
@@ -358,8 +351,17 @@ def GetGypToolchainLib(root, tcname, 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')