diff options
author | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 09:13:49 +0000 |
---|---|---|
committer | dschuff@chromium.org <dschuff@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-13 09:13:49 +0000 |
commit | 07815732b9a77b013671f8942aa92e33049314fd (patch) | |
tree | 4e54fe6910a6da651d90e42909e7faa2ca1b4ae7 /native_client_sdk | |
parent | b471cf41edf3a0bb0e915ad697bf3485bd2da3f5 (diff) | |
download | chromium_src-07815732b9a77b013671f8942aa92e33049314fd.zip chromium_src-07815732b9a77b013671f8942aa92e33049314fd.tar.gz chromium_src-07815732b9a77b013671f8942aa92e33049314fd.tar.bz2 |
Add support in NaCl browser tests for testing pnacl-translated nexes
This CL enables bitcode builds of the various PPAPI libs,
and enables support PNaCl builds of several nexe test targets
(using pre-translated nexes for now).
It also adds a dependency on the IRT shim for those nexes,
and causes the shim to get built in-place for the pnacl toolchain. (since the SDK-packaged toolchain is in a different location, the SDK build script is updated so it copies the shim from the right place).
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2484
Review URL: https://chromiumcodereview.appspot.com/11348048
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@167335 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
-rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py index 52a5c16..04fd798 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -531,13 +531,14 @@ 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') + 'Release', 'gen', 'sdk', 'toolchain', tcname + '_pnacl', + 'lib-' + pnacl_libdir_map[arch]) - 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])) |