diff options
| author | mtklein <mtklein@chromium.org> | 2015-08-24 13:27:01 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-08-24 13:27:01 -0700 |
| commit | a5114d7f26524f75b96e63ffd796d44749b6248c (patch) | |
| tree | 76b0b83da9dc83b6543262c4460d7a30b3b1f389 /gyp | |
| parent | 98f7e334e7c5ac28758c926969e5febc33c22959 (diff) | |
| download | skia-a5114d7f26524f75b96e63ffd796d44749b6248c.tar.gz | |
Have DM manually encode its .png outputs.
This eliminates some variability on various axes: different PNG encoders, different libpng versions, different formats (RGB, indexed), different unpremultiplication, different sRGB tags.
BUG=skia:
Committed: https://skia.googlesource.com/skia/+/3cc0dfffb70c0bd08ed8899efcd2e98da86a6ec7
CQ_EXTRA_TRYBOTS=client.skia:Test-Win8-MSVC-ShuttleB-CPU-AVX2-x86_64-Debug-Trybot
Review URL: https://codereview.chromium.org/1304443002
Diffstat (limited to 'gyp')
| -rw-r--r-- | gyp/dm.gypi | 1 | ||||
| -rw-r--r-- | gyp/libpng.gyp | 39 |
2 files changed, 22 insertions, 18 deletions
diff --git a/gyp/dm.gypi b/gyp/dm.gypi index 9dd3228957..4ce2b4b580 100644 --- a/gyp/dm.gypi +++ b/gyp/dm.gypi @@ -22,6 +22,7 @@ 'etc1.gyp:libetc1', 'flags.gyp:flags', 'jsoncpp.gyp:jsoncpp', + 'libpng.gyp:libpng_static_when_possible', 'skia_lib.gyp:skia_lib', 'svg.gyp:svg', 'tools.gyp:crash_handler', diff --git a/gyp/libpng.gyp b/gyp/libpng.gyp index d918f2d403..45be5f7180 100644 --- a/gyp/libpng.gyp +++ b/gyp/libpng.gyp @@ -12,23 +12,26 @@ 'target_name': 'libpng', 'type': 'none', 'conditions': [ - [ 'skia_os == "android"', - { - 'dependencies': [ - 'android_deps.gyp:png', - ], - 'export_dependent_settings': [ - 'android_deps.gyp:png', - ], - }, { # skia_os != "android" - 'dependencies': [ - 'libpng.gyp:libpng_static', - ], - 'export_dependent_settings': [ - 'libpng.gyp:libpng_static', - ], - } - ] + [ 'skia_os == "android"', { + 'dependencies': [ 'android_deps.gyp:png' ], + 'export_dependent_settings': [ 'android_deps.gyp:png' ], + },{ + 'dependencies': [ 'libpng.gyp:libpng_static' ], + 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], + }] + ] + }, + { + 'target_name': 'libpng_static_when_possible', + 'type': 'none', + 'conditions': [ + [ 'skia_android_framework', { + 'dependencies': [ 'android_deps.gyp:png' ], + 'export_dependent_settings': [ 'android_deps.gyp:png' ], + },{ + 'dependencies': [ 'libpng.gyp:libpng_static' ], + 'export_dependent_settings': [ 'libpng.gyp:libpng_static' ], + }] ] }, { @@ -83,7 +86,7 @@ 'defines': [ 'PNG_ARM_NEON_OPT=0', ], - }, { # skia_os != "ios" + }, { # skia_os != "ios" 'dependencies': [ 'libpng.gyp:libpng_static_neon', ], |