gyp/zlib.gyp - Issue 153093003: Gyp file changes for the android framework.

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

Issue 153093003: Gyp file changes for the android framework. (Closed) Base URL: https://skia.googlesource.com/skia.git@master

Patch Set: Created 6 years, 10 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/zlib.gyp

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

index b26053eaf17dff16c595dfe1a88641f94f9ad91c..eaa44c5fa285b2d2ccffe5318e0b046e91bd8f96 100644

--- a/gyp/zlib.gyp

+++ b/gyp/zlib.gyp

@@ -1,4 +1,3 @@

-# Target for including zlib.

{

'targets': [

{

@@ -31,16 +30,7 @@

}],

[ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nacl"]', {

'link_settings': { 'libraries': [ '-lz', ], },

- 'conditions': [

- [ 'skia_android_framework==0', {

- 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],

- }],

- ],

- }],

- [ 'skia_android_framework', {

- 'include_dirs': [

- 'external/zlib',

- ],

+ 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],

}],

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