Use generated shim headers for zlib.

BUG=165264

Review URL: https://codereview.chromium.org/11632002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@173801 0039d316-1c4b-4281-b951-d872f2087c98

8 files changed, 12 insertions, 31 deletions

diff --git a/third_party/zlib/contrib/minizip/ioapi.h b/third_party/zlib/contrib/minizip/ioapi.h
index c466e97..dfa3b6c 100644
--- a/third_party/zlib/contrib/minizip/ioapi.h
+++ b/third_party/zlib/contrib/minizip/ioapi.h
@@ -42,11 +42,7 @@
 
 #include <stdio.h>
 #include <stdlib.h>
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"
-#endif
 
 #if defined(USE_FILE32API)
 #define fopen64 fopen
diff --git a/third_party/zlib/contrib/minizip/mztools.c b/third_party/zlib/contrib/minizip/mztools.c
index d5b8859..026bf28 100644
--- a/third_party/zlib/contrib/minizip/mztools.c
+++ b/third_party/zlib/contrib/minizip/mztools.c
@@ -8,11 +8,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"
-#endif
 #include "unzip.h"
 
 #define READ_8(adr)  ((unsigned char)*(adr))
diff --git a/third_party/zlib/contrib/minizip/mztools.h b/third_party/zlib/contrib/minizip/mztools.h
index 9731f19..90c834d 100644
--- a/third_party/zlib/contrib/minizip/mztools.h
+++ b/third_party/zlib/contrib/minizip/mztools.h
@@ -12,12 +12,8 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"
 #endif
-#endif
 
 #include "unzip.h"
 
diff --git a/third_party/zlib/contrib/minizip/unzip.c b/third_party/zlib/contrib/minizip/unzip.c
index 4289207..22481a2 100644
--- a/third_party/zlib/contrib/minizip/unzip.c
+++ b/third_party/zlib/contrib/minizip/unzip.c
@@ -72,11 +72,7 @@
         #define NOUNCRYPT
 #endif
 
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"
-#endif
 #include "unzip.h"
 
 #ifdef STDC
diff --git a/third_party/zlib/contrib/minizip/unzip.h b/third_party/zlib/contrib/minizip/unzip.h
index b757a224..80eb36e 100644
--- a/third_party/zlib/contrib/minizip/unzip.h
+++ b/third_party/zlib/contrib/minizip/unzip.h
@@ -48,12 +48,8 @@ extern "C" {
 #endif
 
 #ifndef _ZLIB_H
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"
 #endif
-#endif
 
 #ifndef  _ZLIBIOAPI_H
 #include "ioapi.h"
diff --git a/third_party/zlib/contrib/minizip/zip.c b/third_party/zlib/contrib/minizip/zip.c
index 04c6b25..5a82885 100644
--- a/third_party/zlib/contrib/minizip/zip.c
+++ b/third_party/zlib/contrib/minizip/zip.c
@@ -26,11 +26,7 @@
 #include <stdlib.h>
 #include <string.h>
 #include <time.h>
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"
-#endif
 #include "zip.h"
 
 #ifdef STDC
diff --git a/third_party/zlib/contrib/minizip/zip.h b/third_party/zlib/contrib/minizip/zip.h
index 8788c02..8c06c0a 100644
--- a/third_party/zlib/contrib/minizip/zip.h
+++ b/third_party/zlib/contrib/minizip/zip.h
@@ -47,12 +47,8 @@ extern "C" {
 //#define HAVE_BZIP2
 
 #ifndef _ZLIB_H
-#if defined(USE_SYSTEM_ZLIB)
-#include <zlib.h>
-#else
 #include "third_party/zlib/zlib.h"
 #endif
-#endif
 
 #ifndef _ZLIBIOAPI_H
 #include "ioapi.h"
diff --git a/third_party/zlib/zlib.gyp b/third_party/zlib/zlib.gyp
index e04acbd..8a651f6 100644
--- a/third_party/zlib/zlib.gyp
+++ b/third_party/zlib/zlib.gyp
@@ -63,14 +63,20 @@
             }],
           ],
         }, {
+          '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',
@@ -94,6 +100,9 @@
             'contrib/minizip/zip.c',
             'contrib/minizip/zip.h',
           ],
+          'dependencies': [
+            'zlib',
+          ],
           'include_dirs': [
             '.',
             '../..',