Use generated shim headers for zlib.

third_party/zlib/zlib.gyp

 # 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.
 
 {
   'variables': {
     'conditions': [
       [ 'OS=="none"', {
         # Because we have a patched zlib, we cannot use the system libz.
         # TODO(pvalchev): OpenBSD is purposefully left out, as the system
@@ skipping 45 matching lines @@
             ],
           },
           'conditions': [
             ['OS!="win"', {
               'product_name': 'chrome_zlib',
             }], ['OS=="android"', {
               'toolsets': ['target', 'host'],
             }],
           ],
         }, {
+          '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',
             ],
           },
         }],
       ],
     },
     {
       'target_name': 'minizip',
       'type': 'static_library',
       'conditions': [
         ['use_system_minizip==0', {
           'sources': [
             'contrib/minizip/ioapi.c',
             'contrib/minizip/ioapi.h',
             'contrib/minizip/iowin32.c',
             'contrib/minizip/iowin32.h',
             'contrib/minizip/unzip.c',
             'contrib/minizip/unzip.h',
             'contrib/minizip/zip.c',
             'contrib/minizip/zip.h',
           ],
+          'dependencies': [
+            'zlib',
+          ],
           'include_dirs': [
             '.',
             '../..',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '.',
             ],
           },
           'conditions': [
@@ skipping 37 matching lines @@
             ],
           },
           'cflags': [
             '-Wno-parentheses-equality',
           ],
         }],
       ],
     }
   ],
 }