diff options
author | scroggo <scroggo@google.com> | 2016-01-28 08:41:10 -0800 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2016-01-28 08:41:10 -0800 |
commit | 7579786f3bd5a8fda84a1abc45b16213c3371f93 (patch) | |
tree | cbc6108da49f2ce75e629c6262f2ac711e2cb40f /gyp/common_conditions.gypi | |
parent | d8ff5b336e586ad971ebcafa5fb2eb1e7ac95589 (diff) |
Treat bad values passed to --images as a fatal error
If an option is passed to --images that is either a non-existent path or
a folder with no images matching the supported types, assume this is
an error and exit, so they can supply a valid path instead.
Share code between DM and nanobench in SkCommonFlags.
nanobench now behaves more like DM - it will check a directory for
images that match the supported extensions.
Only consider image paths ending in RAW suffixes as images if
SK_CODE_DECODES_RAW is defined. This prevents us from seeing failure
to decode errors on platforms that cannot decode it.
GOLD_TRYBOT_URL= https://gold.skia.org/search2?unt=true&query=source_type%3Dgm&master=false&issue=1611323004
Review URL: https://codereview.chromium.org/1611323004
Diffstat (limited to 'gyp/common_conditions.gypi')
-rw-r--r-- | gyp/common_conditions.gypi | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi index c7b19de8da..11f98bd28d 100644 --- a/gyp/common_conditions.gypi +++ b/gyp/common_conditions.gypi @@ -12,6 +12,11 @@ 'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)', ], 'conditions' : [ + [ 'skia_codec_decodes_raw', { + 'defines': [ + 'SK_CODEC_DECODES_RAW', + ], + }], ['skia_pic', { 'cflags': [ '-fPIC', |