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

native_client_sdk/src/build_tools/build_sdk.py

Index: native_client_sdk/src/build_tools/build_sdk.py
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 6a6e323ea7d3d79c80ff018a2afff463dc044d0d..8ef049b0bed9240f2a7f419757781fcd72763a73 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -449,7 +449,15 @@ def GypNinjaInstall(pepperdir, toolchains):
 
 
 def GypNinjaBuild_NaCl(rel_out_dir):
-  gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
+  # 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_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
+  gyp_py = os.path.join(SRC_DIR, 'build', 'gyp_chromium')
   nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp')
 
@@ -563,6 +571,13 @@ def NinjaBuild(targets, out_dir):
 def BuildStepBuildToolchains(pepperdir, toolchains):
   buildbot_common.BuildStep('SDK Items')
 
+  # Remove all gypbuild-* dirs.
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR))
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-arm')
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-64')
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-pnacl-ia32')
+  buildbot_common.RemoveDir(os.path.join(OUT_DIR, GYPBUILD_DIR) + '-pnacl-arm')

[Sam Clegg, 2014/12/15 23:17:41]

Why?

[binji, 2014/12/16 01:08:33]

When I first rebuilt on Windows, the previous pdb files were from VS2010, but
the new ones were for VS2013, so the build failed.

We should have been cleaning these directories anyway on the buildbots (although
it does mean that the build will be slower). Perhaps this should be on a flag?

+
   GypNinjaBuild_NaCl(GYPBUILD_DIR)
   GypNinjaBuild_Breakpad(GYPBUILD_DIR)