diff options
| author | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 03:26:07 +0000 |
|---|---|---|
| committer | wangxianzhu@chromium.org <wangxianzhu@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-04 03:26:07 +0000 |
| commit | 17bc0989431f745461627d628474d14128ad3499 (patch) | |
| tree | 34f1923323a7122b2eae2bf3112882cd4edecbc1 /sdch | |
| parent | 371ddc1715aa6b1a88b53aa9faeae71f9752dbdf (diff) | |
| download | chromium_src-17bc0989431f745461627d628474d14128ad3499.zip chromium_src-17bc0989431f745461627d628474d14128ad3499.tar.gz chromium_src-17bc0989431f745461627d628474d14128ad3499.tar.bz2 | |
Avoid zlib symbol conflicts in open-vcdiff
Roll open-vcdiff from 40 to 42 to include the changes about zlib files (http://code.google.com/p/open-vcdiff/source/detail?r=41)
Exclude zlib files when building open-vcdiff for Chromium to avoid link warning due to name conflict with zlib.
BUG=116308
Review URL: http://codereview.chromium.org/9555002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@130552 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'sdch')
| -rw-r--r-- | sdch/sdch.gyp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/sdch/sdch.gyp b/sdch/sdch.gyp index 410629f..6efe4f5 100644 --- a/sdch/sdch.gyp +++ b/sdch/sdch.gyp @@ -1,4 +1,4 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. +# Copyright (c) 2012 The Chromium Authors. All rights reserved. # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. @@ -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', ], |