Merge 151720 - net: workaround compression leaks

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_posix == 1 and OS != "mac" and OS != "openbsd"', {
-        # Link to system .so since we already use it due to GTK.
-        # TODO(pvalchev): OpenBSD is purposefully left out, as the system
-        # zlib brings up an incompatibility that breaks rendering.
+      [ 'OS=="none"', {
+        # Because we have a patched zlib, we cannot use the system libz.
         'use_system_zlib%': 1,
-      }, {  # os_posix != 1 or OS == "mac" or OS == "openbsd"
+      }, {
         'use_system_zlib%': 0,
       }],
     ],
   },
   'targets': [
     {
       'target_name': 'zlib',
       'type': 'static_library',
       'conditions': [
         ['use_system_zlib==0', {
@@ skipping 39 matching lines @@
             'include_dirs': [
               '.',
             ],
           },
           'conditions': [
             ['OS!="win"', {
               'product_name': 'chrome_zlib',
               'sources!': [
                 'contrib/minizip/iowin32.c'
               ],
+            }], ['OS=="android"', {
+              'toolsets': ['target', 'host'],
             }],
           ],
         }, {
           'direct_dependent_settings': {
             'defines': [
               'USE_SYSTEM_ZLIB',
             ],
           },
           'defines': [
             'USE_SYSTEM_ZLIB',
@@ skipping 33 matching lines @@
             ],
           },
           'cflags': [
             '-Wno-parentheses-equality',
           ],
         }],
       ],
     }
   ],
 }