gyp/common.gypi - Issue 1036283002: Remove all code related to NaCl

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: gyp/common.gypi

Issue 1036283002: Remove all code related to NaCl (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Rebase Created 5 years, 9 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: gyp/common.gypi

diff --git a/gyp/common.gypi b/gyp/common.gypi

index ce3fc2669d300c8add3e0a9c06762c15f1f64cb4..f0d653f82a3537e728782bcfb401ba0b1acecedd 100644

--- a/gyp/common.gypi

+++ b/gyp/common.gypi

@@ -25,7 +25,6 @@

'variables': {

'conditions': [

[ 'skia_os != OS and not ((skia_os == "ios" and OS == "mac") or \

- (skia_os == "nacl" and OS == "linux") or \

(skia_os == "chromeos" and OS == "linux"))', {

'error': '<!(Cannot build with skia_os=<(skia_os) on OS=<(OS))',

}],

@@ -38,9 +37,6 @@

[ 'skia_arch_width != 32 and skia_arch_width != 64', {

'error': '<!(skia_arch_width can only be 32 or 64 bits not <(skia_arch_width) bits)',

}],

- [ 'skia_os == "nacl" and OS != "linux"', {

- 'error': '<!(Skia NaCl build only currently supported on Linux.)',

- }],

[ 'skia_os == "chromeos" and OS != "linux"', {

'error': '<!(Skia ChromeOS build is only supported on Linux.)',

}],

« no previous file with comments | « gyp/apptype_console.gypi ('k') | gyp/common_conditions.gypi » ('j') | no next file with comments »