diff options
| author |  msarett <msarett@google.com> | 2016-03-04 13:27:35 -0800 |
|---|---|---|
| committer |  Commit bot <commit-bot@chromium.org> | 2016-03-04 13:27:35 -0800 |
| commit | 6a738217eaeb9aed45a07efdfc1ae52372430d87 (patch) | |
| tree | 2e72d8f573fd4911ecd0290aa6ce8a4106e3b296 /gyp | |
| parent | 97220199d46cb3b885303878a30b311c628a9337 (diff) | |
Set SkColorSpace object for PNGs and parse ICC profiles
Code for ICC profile parsing adapted from:
https://codereview.chromium.org/1707033002/
BUG=skia:
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1726823002
Review URL: https://codereview.chromium.org/1726823002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/codec_android.gyp | 1 | ||||
| -rw-r--r-- | gyp/tools.gyp | 27 |
2 files changed, 15 insertions, 13 deletions
diff --git a/gyp/codec_android.gyp b/gyp/codec_android.gyp index ca9c7a36b5..a303494e43 100644 --- a/gyp/codec_android.gyp +++ b/gyp/codec_android.gyp @@ -25,6 +25,7 @@ '../include/private', '../src/android', '../src/codec', + '../src/core', ], 'sources': [ '../src/android/SkBitmapRegionCanvas.cpp', diff --git a/gyp/tools.gyp b/gyp/tools.gyp index e60879bc5c..49e441b9e2 100644 --- a/gyp/tools.gyp +++ b/gyp/tools.gyp @@ -264,19 +264,19 @@ ], }, { - 'target_name': 'get_images_from_skps', - 'type': 'executable', - 'sources': [ - '../tools/get_images_from_skps.cpp', - ], - 'include_dirs': [ - '../include/private', - '../src/core', - ], - 'dependencies': [ - 'flags.gyp:flags', - 'skia_lib.gyp:skia_lib', - ], + 'target_name': 'get_images_from_skps', + 'type': 'executable', + 'sources': [ + '../tools/get_images_from_skps.cpp', + ], + 'include_dirs': [ + '../src/core', + '../include/private', + ], + 'dependencies': [ + 'flags.gyp:flags', + 'skia_lib.gyp:skia_lib', + ], }, { 'target_name': 'gpuveto', @@ -469,6 +469,7 @@ }, 'include_dirs': [ '<@(includes_to_test)', + '../src/core', ], 'sources': [ # unused_param_test.cpp is generated by the action below. |