[NaCl SDK] Use gyp_nacl when building NaCl components via gyp

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 447 matching lines @@
       raise AssertionError('unexpected toolchain value: %s' % tc)
 
     for xarch in xarches:
       src_dir = GetGypBuiltLib(tc, xarch)
       dst_dir = GetOutputToolchainLib(pepperdir, tc, xarch)
       libc = GetToolchainLibc(tc)
       InstallFiles(src_dir, dst_dir, TOOLCHAIN_LIBS[libc])
 
 
 def GypNinjaBuild_NaCl(rel_out_dir):
-  # 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')
+  gyp_py = os.path.join(NACL_DIR, 'build', 'gyp_nacl')
   nacl_core_sdk_gyp = os.path.join(NACL_DIR, 'build', 'nacl_core_sdk.gyp')
   all_gyp = os.path.join(NACL_DIR, 'build', 'all.gyp')
 
   out_dir_32 = MakeNinjaRelPath(rel_out_dir + '-ia32')
   out_dir_64 = MakeNinjaRelPath(rel_out_dir + '-x64')
   out_dir_arm = MakeNinjaRelPath(rel_out_dir + '-arm')
   out_dir_clang_32 = MakeNinjaRelPath(rel_out_dir + '-clang-ia32')
   out_dir_clang_64 = MakeNinjaRelPath(rel_out_dir + '-clang-x64')
   out_dir_clang_arm = MakeNinjaRelPath(rel_out_dir + '-clang-arm')
 
@@ skipping 591 matching lines @@
       BuildStepArchivePNaClComponent(chrome_revision)
 
   return 0
 
 
 if __name__ == '__main__':
   try:
     sys.exit(main(sys.argv[1:]))
   except KeyboardInterrupt:
     buildbot_common.ErrorExit('build_sdk: interrupted')