Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

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
  • Loading branch information...
commit fdee8c6a3387ff2a111e315585e9467a68278555 1 parent 8104feb
wangxianzhu@chromium.org authored
Showing with 5 additions and 5 deletions.
  1. +1 −1  DEPS
  2. +4 −4 sdch/sdch.gyp
View
2  DEPS
@@ -75,7 +75,7 @@ deps = {
(Var("googlecode_url") % "seccompsandbox") + "/trunk@178",
"src/sdch/open-vcdiff":
- (Var("googlecode_url") % "open-vcdiff") + "/trunk@40",
+ (Var("googlecode_url") % "open-vcdiff") + "/trunk@42",
"src/testing/gtest":
(Var("googlecode_url") % "googletest") + "/trunk@560",
View
8 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',
],
Please sign in to comment.
Something went wrong with that request. Please try again.