native_client_sdk/src/build_tools/build_sdk.py - Issue 11360223: Revert "Add support in NaCl browser tests for testing pnacl-translated nexes"

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 11360223: Revert "Add support in NaCl browser tests for testing pnacl-translated nexes" (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 8 years, 1 month ago

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

Jump to:

View side-by-side diff with in-line comments

Download patch

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 04fd798a791fbfb5b77da9a5af838e64c254f6c1..52a5c16155230b035da884c6cb68b5386a4b43bf 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]))

« no previous file with comments | « chrome/test/nacl/nacl_browsertest_util.cc ('k') | ppapi/native_client/native_client.gyp » ('j') | no next file with comments »