Revert of Treat bad values passed to --images as a fatal error (patchset #17 id:320001 of https://codereview.chromium.org/1611323004/ )

Reason for revert:
Speculative to fix windows bots

Original issue's description:
> 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
>
> Committed: https://skia.googlesource.com/skia/+/7579786f3bd5a8fda84a1abc45b16213c3371f93

TBR=mtklein@google.com,borenet@google.com,msarett@google.com

NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
# Not skipping CQ checks because original CL landed more than 1 days ago.

Review URL: https://codereview.chromium.org/1653543002

3 files changed, 13 insertions, 17 deletions

diff --git a/gyp/codec.gyp b/gyp/codec.gyp
index 2043b35567..596270a570 100644
--- a/gyp/codec.gyp
+++ b/gyp/codec.gyp
@@ -68,7 +68,8 @@
         'TURBO_HAS_SKIP',
       ],
       'conditions': [
-        ['skia_codec_decodes_raw', {
+        # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime()].
+        ['skia_codec_decodes_raw and skia_os != "chromeos"', {
           'dependencies': [
             'raw_codec',
           ],
@@ -76,7 +77,7 @@
       ],
     }, {
       # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
-      # controlled by skia_codec_decodes_raw flag.
+      # controlled by SK_CODEC_DECODES_RAW flag.
       'target_name': 'raw_codec',
       'product_name': 'raw_codec',
       'type': 'static_library',
@@ -110,7 +111,13 @@
         'include_dirs': [
           '../include/codec',
         ],
+        'defines': [
+          'SK_CODEC_DECODES_RAW',
+        ],
       },
+      'defines': [
+        'SK_CODEC_DECODES_RAW',
+      ],
       'conditions': [
         ['skia_arch_type == "x86" or skia_arch_type == "arm"', {
           'defines': [
diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 11f98bd28d..c7b19de8da 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -12,11 +12,6 @@
     'SK_FORCE_DISTANCE_FIELD_TEXT=<(skia_force_distance_field_text)',
   ],
   'conditions' : [
-    [ 'skia_codec_decodes_raw', {
-      'defines': [
-        'SK_CODEC_DECODES_RAW',
-      ],
-    }],
     ['skia_pic', {
      'cflags': [
        '-fPIC',
diff --git a/gyp/common_variables.gypi b/gyp/common_variables.gypi
index 17c5364afc..abbe729da1 100644
--- a/gyp/common_variables.gypi
+++ b/gyp/common_variables.gypi
@@ -38,6 +38,10 @@
   'variables': {  # level 1
     'angle_path%': '../',
 
+    # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be controlled
+    # by this variable.
+    'skia_codec_decodes_raw%': 1,
+
     'variables': {  # level 2
 
       # Variables needed by conditions list within the level-2 variables dict.
@@ -58,14 +62,6 @@
           }, {
             'skia_arch_type%': 'x86',
           }],
-          # RAW codec needs exceptions. Due to that, it is a separate target. Its usage can be
-          # controlled by skia_codec_decodes_raw.
-          ['skia_os == "chromeos"', {
-            # FIXME: fix the support for ChromeOS [DNG SDK issue with clock_gettime()].
-            'skia_codec_decodes_raw%' : 0,
-          }, {
-            'skia_codec_decodes_raw%' : 1,
-          }],
         ],
         'arm_version%': 0,
         'arm_neon%': 0,
@@ -76,7 +72,6 @@
       # so that siblings of the level-2 'variables' dict can see them.
       # (skia_os will depend on skia_android_framework.)
       'skia_android_framework%': '<(skia_android_framework)',
-      'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
       'skia_arch_type%': '<(skia_arch_type)',
       'arm_version%': '<(arm_version)',
       'arm_neon%': '<(arm_neon)',
@@ -219,7 +214,6 @@
     'skia_gpu_extra_tests_path%': '<(skia_gpu_extra_tests_path)',
     'skia_stroke_path_rendering%': '<(skia_stroke_path_rendering)',
     'skia_android_framework%': '<(skia_android_framework)',
-    'skia_codec_decodes_raw%': '<(skia_codec_decodes_raw)',
     'skia_use_android_framework_defines%': '<(skia_use_android_framework_defines)',
     'skia_use_system_json%': '<(skia_use_system_json)',
     'skia_android_path_rendering%': '<(skia_android_path_rendering)',