Revert of Make SkPicture/SkImageGenerator default to SkCodec

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index d693266aa4a33e8b90fe9cd6dc1043d15b48cab8..e303669310cf49fc88fa34f229655d623b31a96f 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -82,6 +82,7 @@
          ],
          'dependencies': [
             'flags.gyp:flags',
+            'lazy_decode_bitmap',
             'skia_lib.gyp:skia_lib',
          ],
     },
@@ -264,6 +265,20 @@
       ],
     },
     {
+        'target_name': 'lazy_decode_bitmap',
+        'type': 'static_library',
+        'sources': [ '../tools/LazyDecodeBitmap.cpp' ],
+        'include_dirs': [
+            '../include/private',
+            '../src/core',
+            '../src/lazy',
+        ],
+        'dependencies': [
+            'flags.gyp:flags',
+            'skia_lib.gyp:skia_lib'
+        ],
+    },
+    {
       'target_name': 'gpuveto',
       'type': 'executable',
       'sources': [
@@ -275,6 +290,7 @@
         '../src/images',
       ],
       'dependencies': [
+        'lazy_decode_bitmap',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
@@ -316,6 +332,7 @@
         '../src/core/',
       ],
       'dependencies': [
+        'lazy_decode_bitmap',
         'effects.gyp:effects',
         'flags.gyp:flags',
         'images.gyp:images',
@@ -349,6 +366,7 @@
         '../tools/pinspect.cpp',
       ],
       'dependencies': [
+        'lazy_decode_bitmap',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],