gyp/tools.gyp - 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/tools.gyp

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/tools.gyp

diff --git a/gyp/tools.gyp b/gyp/tools.gyp

index 55f4819371955070b2dba6a5120e73717ed59d0c..7b8122c3e38af38a85d0e629179185e623e4fb0e 100644

--- a/gyp/tools.gyp

+++ b/gyp/tools.gyp

@@ -242,22 +242,12 @@

'target_name': 'skhello',

'type': 'executable',

'dependencies': [

+ 'flags.gyp:flags',

+ 'pdf.gyp:pdf',

'skia_lib.gyp:skia_lib',

- 'conditions': [

- [ 'skia_os == "nacl"', {

- 'sources': [

- '../platform_tools/nacl/src/nacl_hello.cpp',

- ],

- }, {

- 'sources': [

- '../tools/skhello.cpp',

- ],

- 'dependencies': [

- 'flags.gyp:flags',

- 'pdf.gyp:pdf',

- ],

- }],

+ 'sources': [

+ '../tools/skhello.cpp',

{

@@ -653,7 +643,6 @@

'<(skia_include_path)/views/SkOSWindow_Android.h',

'<(skia_include_path)/views/SkOSWindow_iOS.h',

'<(skia_include_path)/views/SkOSWindow_Mac.h',

- '<(skia_include_path)/views/SkOSWindow_NaCl.h',

'<(skia_include_path)/views/SkOSWindow_SDL.h',

'<(skia_include_path)/views/SkOSWindow_Unix.h',

'<(skia_include_path)/views/SkOSWindow_Win.h',

« no previous file with comments | « gyp/ports.gyp ('k') | gyp/utils.gyp » ('j') | no next file with comments »