Add pnacl shims to the chrome build.

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 357 matching lines @@
                      pepper_ver,
                      'glibc')
 
     if 'pnacl' in toolchains:
       buildbot_common.Run(
           GetBuildArgs('pnacl', pnacldir, pepperdir, 'x86', '32'),
           cwd=NACL_DIR, shell=(platform=='win'))
       buildbot_common.Run(
           GetBuildArgs('pnacl', pnacldir, pepperdir, 'x86', '64'),
           cwd=NACL_DIR, shell=(platform=='win'))
-      # Pnacl libraries are typically bitcode, but some are native and
-      # will be looked up in the native library directory.
-      buildbot_common.Move(
-          os.path.join(GetToolchainNaClLib('pnacl', pnacldir, 'x86', '64'),
-                       'libpnacl_irt_shim.a'),
+      # Get pnacl irt shim from chrome build.
+      buildbot_common.Copy(
+          os.path.join(OUT_DIR, 'Release', 'libpnacl_irt_shim.a'),
           GetPNaClNativeLib(pnacldir, 'x86-64'))
       InstallHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'x86'),
                      pepper_ver,
                      'newlib')
   else:
     buildbot_common.ErrorExit('Missing arch %s' % arch)
 
 
 def BuildStepCopyBuildHelpers(pepperdir, platform):
   buildbot_common.BuildStep('Copy build helpers')
@@ skipping 439 matching lines @@
       # Archive on non-trybots.
       if options.archive or buildbot_common.IsSDKBuilder():
         BuildStepArchiveBundle(pepper_ver, clnumber, tarfile)
         BuildStepArchiveSDKTools()
 
   return 0
 
 
 if __name__ == '__main__':
   sys.exit(main(sys.argv))