third_party/zlib/zlib.gyp - Issue 11632002: Use generated shim headers for zlib.

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

Issue 11632002: Use generated shim headers for zlib. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: fixes Created 8 years 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: third_party/zlib/zlib.gyp

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

index e04acbd4d8354bcf0c5d1070bcb06e898a9ad857..8a651f6d7c0e7c43bd9c8eebaa5e385aac43be2d 100644

--- a/third_party/zlib/zlib.gyp

+++ b/third_party/zlib/zlib.gyp

@@ -63,14 +63,20 @@

}],

}, {

+ 'variables': {

+ 'headers_root_path': '.',

+ 'header_filenames': [

+ 'zlib.h',

+ ],

+ },

+ 'includes': [

+ '../../build/shim_headers.gypi',

+ ],

'direct_dependent_settings': {

'defines': [

'USE_SYSTEM_ZLIB',

- 'defines': [

- 'USE_SYSTEM_ZLIB',

- ],

'link_settings': {

'libraries': [

'-lz',

@@ -94,6 +100,9 @@

'contrib/minizip/zip.c',

'contrib/minizip/zip.h',

+ 'dependencies': [

+ 'zlib',

+ ],

'include_dirs': [

'.',

'../..',