Revert "Add support in NaCl browser tests for testing pnacl-translated nexes"

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 513 matching lines @@
 
     if 'pnacl' in toolchains:
       shell = platform == 'win'
       buildbot_common.Run(
           GetBuildArgs('pnacl', pnacldir, pepperdir, 'x86', '32'),
           cwd=NACL_DIR, shell=shell)
       buildbot_common.Run(
           GetBuildArgs('pnacl', pnacldir, pepperdir, 'x86', '64'),
           cwd=NACL_DIR, shell=shell)
 
-      pnacl_libdir_map = {'ia32': 'x86-64', 'arm': 'arm'}
       for arch in ('ia32', 'arm'):
         # Fill in the latest native pnacl shim library from the chrome build.
         GypNinjaBuild_Pnacl('gypbuild-' + arch, arch)
         release_build_dir = os.path.join(OUT_DIR, 'gypbuild-' + arch,
-            'Release', 'gen', 'sdk', 'toolchain', tcname + '_pnacl',
-            'lib-' + pnacl_libdir_map[arch])
+                                         'Release')
 
+        pnacl_libdir_map = { 'ia32': 'x86-64', 'arm': 'arm' }
         buildbot_common.CopyFile(
             os.path.join(release_build_dir, 'libpnacl_irt_shim.a'),
             GetPNaClNativeLib(pnacldir, pnacl_libdir_map[arch]))
 
       InstallHeaders(GetToolchainNaClInclude('pnacl', pnacldir, 'x86'),
                      pepper_ver,
                      'newlib')
   else:
     buildbot_common.ErrorExit('Missing arch %s' % arch)
 
@@ skipping 468 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))