diff options
| author |  msarett <msarett@google.com> | 2015-03-27 12:17:00 -0700 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2015-03-27 12:17:00 -0700 |
| commit | 255dcd11992ebe74eb54202c48cf5394d33a8ce6 (patch) | |
| tree | cebd8cf7ae2a220fd24a2cc9b5fe605abef11ea0 /gyp/giflib.gyp | |
| parent | a096d7a6d03662073f4cd46f7db5fe2cf5495c36 (diff) | |
WIP: Added support for giflib, updated jpeg and png
BUG=skia:3257
Review URL: https://codereview.chromium.org/1038863003
Diffstat (limited to 'gyp/giflib.gyp')
| -rw-r--r-- | gyp/giflib.gyp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/gyp/giflib.gyp b/gyp/giflib.gyp index 3a2c2153bf..9263835d2e 100644 --- a/gyp/giflib.gyp +++ b/gyp/giflib.gyp @@ -11,7 +11,7 @@ { 'target_name': 'giflib', 'conditions': [ - [ 'skia_giflib_static', + [ 'skia_android_framework == 0', { 'type': 'static_library', 'defines': [ @@ -35,17 +35,18 @@ '../third_party/externals/giflib/gifalloc.c', '../third_party/externals/giflib/gif_err.c', ], - }, { # not skia_giflib_static + }, { # skia_android_framework 'type': 'none', 'direct_dependent_settings': { - 'link_settings': { - 'libraries': [ - '-lgif', - ], - }, - }, + 'libraries' : [ + 'libgif.a', + ], + 'include_dirs': [ + 'external/giflib', + ] + } } - ], + ] ] } ] |