native_client_sdk/src/build_tools/build_sdk.py - Issue 2001853002: Re-enable 32-bit linux for nacl sdk, disable for mac tests.

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 2001853002: Re-enable 32-bit linux for nacl sdk, disable for mac tests. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 4 years, 7 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:

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 4ccfbb9af527280ca3eb2326a1a45616a04a28c1..53377002ae028f71b8d7b0b2253a3d246bdd9f9e 100755

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

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

@@ -370,7 +370,7 @@ def GnNinjaInstall(pepperdir, toolchains):

pair[1] += '.exe'

InstallFiles(GetNinjaOutDir('x64'), tools_dir, tools_files_x64)

- if platform != 'mac' and platform != 'linux':

+ if platform != 'mac':

InstallFiles(GetNinjaOutDir('x86'), tools_dir, tools_files_x86)

if platform == 'linux':

InstallFiles(GetNinjaOutDir('arm'), tools_dir, tools_files_arm)

@@ -407,7 +407,7 @@ def GnNinjaBuildAll(rel_out_dir):

GnNinjaBuild('x64', MakeNinjaRelPath('-x64'),

['nacl_sdk_untrusted=true'])

- if platform != 'mac' and platform != 'linux':

+ if platform != 'mac':

GnNinjaBuild('x86', MakeNinjaRelPath('-x86'))

if platform == 'linux':

« no previous file with comments | « no previous file | native_client_sdk/src/build_tools/sdk_files.list » ('j') | no next file with comments »