sdch/sdch.gyp - Issue 9555002: Avoid zlib symbol conflicts in open-vcdiff

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

Issue 9555002: Avoid zlib symbol conflicts in open-vcdiff (Closed) Base URL: http://git.chromium.org/chromium/src.git@master

Patch Set: Roll open-vcdiff 40:42 Created 8 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: sdch/sdch.gyp

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

index 410629f29004cfda613cc72fa646023a20d121a0..7a14bf0e64bfec49c99ebd6fd509671820c278ca 100644

--- a/sdch/sdch.gyp

+++ b/sdch/sdch.gyp

@@ -10,9 +10,11 @@

{

'target_name': 'sdch',

'type': 'static_library',

+ 'dependencies': [

+ '../third_party/zlib/zlib.gyp:zlib',

+ ],

'sources': [

'open-vcdiff/src/addrcache.cc',

- 'open-vcdiff/src/adler32.c',

'open-vcdiff/src/blockhash.cc',

'open-vcdiff/src/blockhash.h',

'open-vcdiff/src/checksum.h',

@@ -39,8 +41,6 @@

'open-vcdiff/src/vcdiff_defs.h',

'open-vcdiff/src/vcdiffengine.cc',

'open-vcdiff/src/vcdiffengine.h',

- 'open-vcdiff/src/zconf.h',

- 'open-vcdiff/src/zlib.h',

'open-vcdiff/vsprojects/config.h',

'open-vcdiff/vsprojects/stdint.h',

« no previous file with comments | « DEPS ('k') | no next file » | no next file with comments »