Merge 151720 - net: workaround compression leaks

third_party/zlib/zlib.gyp

Index: third_party/zlib/zlib.gyp
===================================================================
--- third_party/zlib/zlib.gyp	(revision 153495)
+++ third_party/zlib/zlib.gyp	(working copy)
@@ -5,12 +5,10 @@
 {
   '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,
       }],
     ],
@@ -70,6 +68,8 @@
               'sources!': [
                 'contrib/minizip/iowin32.c'
               ],
+            }], ['OS=="android"', {
+              'toolsets': ['target', 'host'],
             }],
           ],
         }, {