diff options
Diffstat (limited to 'gyp/codec.gyp')
| -rw-r--r-- | gyp/codec.gyp | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/gyp/codec.gyp b/gyp/codec.gyp index eb49f6cd5c..1373773940 100644 --- a/gyp/codec.gyp +++ b/gyp/codec.gyp @@ -18,7 +18,6 @@ 'dependencies': [ 'core.gyp:*', 'giflib.gyp:giflib', - 'libpng.gyp:libpng', ], 'cflags':[ # FIXME: This gets around a longjmp warning. See @@ -47,6 +46,21 @@ '../include/codec', ], }, + 'conditions': [ + [ 'skia_android_framework == 1', + { + # TODO(djsollen): this is a temporary dependency until we can update + # the android framework to a more recent version of libpng. + 'dependencies': [ + 'libpng.gyp:libpng', + ], + }, { # !skia_android_framework + 'dependencies': [ + 'libpng.gyp:libpng_static', + ], + } + ] + ] }, ], } |