Index: gyp/zlib.gyp |
diff --git a/gyp/zlib.gyp b/gyp/zlib.gyp |
index eaa44c5fa285b2d2ccffe5318e0b046e91bd8f96..67cc7c2286ff4b85d9ed946fefdfd3ffdc1d934d 100644 |
--- a/gyp/zlib.gyp |
+++ b/gyp/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': [ |
djsollen
2014/01/21 17:47:37
is this condition necessary?
scroggo
2014/01/21 19:10:06
Yes. When I attempt to build the Android framework
|
+ [ 'skia_android_framework==0', { |
+ 'defines': [ 'SK_ZLIB_INCLUDE=<zlib.h>', ], |
+ }], |
+ ], |
+ }], |
+ [ 'skia_android_framework', { |
+ 'include_dirs': [ |
+ '$(TOPDIR)external/zlib', |
+ ], |
}], |
], |
}, |