diff options
author | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-20 14:51:47 +0000 |
---|---|---|
committer | robertphillips@google.com <robertphillips@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> | 2012-03-20 14:51:47 +0000 |
commit | 3e93e8010ecf1902c61b3fb9b061d83cb54657d2 (patch) | |
tree | 03d4a94f6d6373c6b53b751f38add8ca6bff99c3 /libjpeg.gyp | |
parent | 808b86d447ecd22104400bf9b3a01fa6042844aa (diff) | |
download | gyp-3e93e8010ecf1902c61b3fb9b061d83cb54657d2.tar.gz |
Fix for CMYK jpeg decoding issue (69 - unable to read some jpeg files on android)
http://codereview.appspot.com/5785054/
git-svn-id: http://skia.googlecode.com/svn/trunk/gyp@3438 2bbb7eff-a529-9590-31e7-b0007b416f81
Diffstat (limited to 'libjpeg.gyp')
-rw-r--r-- | libjpeg.gyp | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/libjpeg.gyp b/libjpeg.gyp index 4826f48..d628f66 100644 --- a/libjpeg.gyp +++ b/libjpeg.gyp @@ -13,6 +13,19 @@ 'dependencies': [ '../third_party/externals/libjpeg/libjpeg.gyp:libjpeg', ], + + 'conditions': [ + [ 'os_posix != 1 or OS == "mac"', { + # need to set include path when using our own version + 'direct_dependent_settings': { + 'include_dirs': [ + '../third_party/externals/libjpeg', + ], + }, + },], + ], + + }, ], } |