summaryrefslogtreecommitdiffstats
path: root/native_client_sdk
diff options
context:
space:
mode:
authorygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 12:16:36 +0000
committerygorshenin@chromium.org <ygorshenin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-13 12:16:36 +0000
commitdbda279f32c583b735212546cff0077cd9d47052 (patch)
treed0c61ee98b7fac4735b1481fc3320c2f8adfe945 /native_client_sdk
parent3f71d8b28319b01ee5431136dcff46d429760de8 (diff)
downloadchromium_src-dbda279f32c583b735212546cff0077cd9d47052.zip
chromium_src-dbda279f32c583b735212546cff0077cd9d47052.tar.gz
chromium_src-dbda279f32c583b735212546cff0077cd9d47052.tar.bz2
Revert "Add support in NaCl browser tests for testing pnacl-translated nexes"
This reverts commit 07815732b9a77b013671f8942aa92e33049314fd. BUG=http://code.google.com/p/nativeclient/issues/detail?id=2484 TBR=dschuff@chromium.org Review URL: https://codereview.chromium.org/11360223 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167376 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-xnative_client_sdk/src/build_tools/build_sdk.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py
index 04fd798..52a5c16 100755
--- a/native_client_sdk/src/build_tools/build_sdk.py
+++ b/native_client_sdk/src/build_tools/build_sdk.py
@@ -531,14 +531,13 @@ def BuildStepBuildToolchains(pepperdir, platform, arch, pepper_ver,
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]))