miniz support in SkFlate / PDF

gyp/skflate.gyp

 # Target for including SkFlate.
 {
   'targets': [
     {
       'target_name': 'skflate',
       'type': 'static_library',
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
+      'dependencies': [ 'skia_lib.gyp:skia_lib' ],
+      'conditions': [
+        [ 'skia_android_framework', {
+            'dependencies': [ 'zlib.gyp:zlib' ]
+        },{
+            'dependencies': [ 'zlib.gyp:miniz' ]   # Our bots.
+        }],
       ],
-      'conditions': [
-        # When zlib is not availible on a system,
-        # SK_NO_FLATE will be defined.
-        [ 'skia_os != "win"',
-          {
-            'dependencies': [
-              'zlib.gyp:zlib',
-            ],
-          }
-        ],
-      ],
-      'sources': [
-        '../src/core/SkFlate.cpp',
-      ],
+      'sources': [ '../src/core/SkFlate.cpp' ],
     },
   ],
 }