diff options
| author | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 00:25:12 +0000 |
|---|---|---|
| committer | jvoung@chromium.org <jvoung@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-30 00:25:12 +0000 |
| commit | a397169facbe431de97afec378e48132391b42f5 (patch) | |
| tree | 2e2fe25c30bed0346430c9a2ab497dd36f00457c /native_client_sdk | |
| parent | 1dbd841e11eb501bf189e635fa724f62e3ccb45e (diff) | |
| download | chromium_src-a397169facbe431de97afec378e48132391b42f5.zip chromium_src-a397169facbe431de97afec378e48132391b42f5.tar.gz chromium_src-a397169facbe431de97afec378e48132391b42f5.tar.bz2 | |
Add a gyp action for laying out the pnacl translator nexes into PRODUCT_DIR.
This may help us include the translators later.
The file copying is adapted to follow the naming scheme expected
by pnacl_file_host. We will need to adapt the plugin later
to actually request files that way.
NOTE: The sandboxed translator requires shims always, even if they don't
do much (e.g., for x86-32). We rely on the untrusted.gypi building both
x86-32 and x86-64 versions, and copy both for Windows.
This requires modifying the SDK to copy from the gen/ directory too.
Also switch prints to using logging module to avoid printing
superfluous stuff during ninja builds, etc., and supress
printing unless --verbose is given.
BUG= http://code.google.com/p/nativeclient/issues/detail?id=2365
Review URL: https://chromiumcodereview.appspot.com/11411051
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@170302 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'native_client_sdk')
| -rwxr-xr-x | native_client_sdk/src/build_tools/build_sdk.py | 6 |
1 files changed, 3 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 1eb4aef..5a88109 100755 --- a/native_client_sdk/src/build_tools/build_sdk.py +++ b/native_client_sdk/src/build_tools/build_sdk.py @@ -528,10 +528,10 @@ def BuildStepBuildToolchains(pepperdir, platform, arch, pepper_ver, 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') - pnacl_libdir_map = { 'ia32': 'x86-64', 'arm': 'arm' } + release_build_dir = os.path.join(OUT_DIR, 'gypbuild-' + arch, + 'Release', 'gen', 'tc_pnacl_translate', + 'lib-' + pnacl_libdir_map[arch]) buildbot_common.CopyFile( os.path.join(release_build_dir, 'libpnacl_irt_shim.a'), GetPNaClNativeLib(pnacldir, pnacl_libdir_map[arch])) |