1 files changed, 11 insertions, 1 deletions
diff --git a/zlib.gyp b/zlib.gyp
index eaa44c5..b26053e 100644
--- a/zlib.gyp
+++ b/zlib.gyp
@@ -1,3 +1,4 @@
+# Target for including zlib.
 {
   'targets': [
     {
@@ -30,7 +31,16 @@
         }],
         [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "nacl"]', {
           'link_settings': { 'libraries': [ '-lz', ], },
-          'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+          'conditions': [
+            [ 'skia_android_framework==0', {
+              'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ],
+            }],
+          ],
+        }],
+        [ 'skia_android_framework', {
+          'include_dirs': [
+            'external/zlib',
+          ],
         }],
       ],
     },