Avoid zlib symbol conflicts in open-vcdiff

sdch/sdch.gyp

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'sdch',
       'type': 'static_library',
+      'dependencies': [
+        '../third_party/zlib/zlib.gyp:zlib',
+      ],
       'sources': [
         'open-vcdiff/src/addrcache.cc',
-        'open-vcdiff/src/adler32.c',
+        # We use third_party/zlib instead.

[Mark Mentovai, 2012/03/01 19:46:34]

1. Don’t use “we” in comments.

2. I’d group the three commented-out files together, way at the bottom of the
list.

[Xianzhu, 2012/03/01 21:28:55]

Done.

+        # 'open-vcdiff/src/adler32.c',
         'open-vcdiff/src/blockhash.cc',
         'open-vcdiff/src/blockhash.h',
         'open-vcdiff/src/checksum.h',

[Mark Mentovai, 2012/03/01 19:46:34]

This file says

#include "zlib.h"

How are you sure that it will include the zlib.h in third_party/zlib as opposed
to the one in sdch/open-vcdiff/src? I don’t think it’ll include the right one.

[Xianzhu, 2012/03/01 21:28:55]

Yes, it will include the one in sdch/open-vcdiff/src. As adler32 is the only
function needed from zlib and it's unlikely that future zlib would break binary
compatibility, do you think we can just leave the headers here? I'm trying not
to change open-vcdiff source code.

         'open-vcdiff/src/codetable.cc',
         'open-vcdiff/src/codetable.h',
         'open-vcdiff/src/compile_assert.h',
         'open-vcdiff/src/decodetable.cc',
         'open-vcdiff/src/decodetable.h',
         'open-vcdiff/src/encodetable.cc',
         'open-vcdiff/src/encodetable.h',
         'open-vcdiff/src/google/output_string.h',
         'open-vcdiff/src/google/vcdecoder.h',
         'open-vcdiff/src/headerparser.cc',
         'open-vcdiff/src/headerparser.h',
         'open-vcdiff/src/instruction_map.cc',
         'open-vcdiff/src/instruction_map.h',
         'open-vcdiff/src/logging.cc',
         'open-vcdiff/src/logging.h',
         'open-vcdiff/src/rolling_hash.h',
         'open-vcdiff/src/testing.h',
         'open-vcdiff/src/varint_bigendian.cc',
         'open-vcdiff/src/varint_bigendian.h',
         'open-vcdiff/src/vcdecoder.cc',
         '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',
+        # We use third_party/zlib instead.
+        # 'open-vcdiff/src/zconf.h',
+        # 'open-vcdiff/src/zlib.h',
         'open-vcdiff/vsprojects/config.h',
         'open-vcdiff/vsprojects/stdint.h',
       ],
       'include_dirs': [
         'open-vcdiff/src',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           'open-vcdiff/src',
         ],
       },
       'conditions': [
         [ 'OS == "linux" or OS == "android"', { 'include_dirs': [ 'linux' ] } ],
         [ 'os_bsd==1 or OS=="solaris"', { 'include_dirs': [ 'bsd' ] } ],
         [ 'OS == "mac"', { 'include_dirs': [ 'mac' ] } ],
         [ 'OS == "win"', { 'include_dirs': [ 'open-vcdiff/vsprojects' ] } ],
       ],
     },
   ],
 }