native_client_sdk/src/build_tools/build_sdk.py - Issue 10908085: Add pnacl shims to the chrome build.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: native_client_sdk/src/build_tools/build_sdk.py

Issue 10908085: Add pnacl shims to the chrome build. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Created 8 years, 3 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

Index: native_client_sdk/src/build_tools/build_sdk.py

diff --git a/native_client_sdk/src/build_tools/build_sdk.py b/native_client_sdk/src/build_tools/build_sdk.py

index f9836f48023cb4f0bea628cf5095ec3006811795..177c12ad3590b4aa853579369d4327f630d20634 100755

--- a/native_client_sdk/src/build_tools/build_sdk.py

+++ b/native_client_sdk/src/build_tools/build_sdk.py

@@ -375,11 +375,9 @@ def BuildStepBuildToolchains(pepperdir, platform, arch, pepper_ver, toolchains):

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,