Revert of Make SkPicture/SkImageGenerator default to SkCodec

gyp/tools.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
     # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
@@ skipping 64 matching lines @@
         'sources': [
             '../tools/dump_record.cpp',
             '../tools/DumpRecord.cpp',
          ],
          'include_dirs': [
             '../include/private',
             '../src/core',
          ],
          'dependencies': [
             'flags.gyp:flags',
+            'lazy_decode_bitmap',
             'skia_lib.gyp:skia_lib',
          ],
     },
     {
       'target_name': 'chrome_fuzz',
       'type': 'executable',
       'sources': [
         '../tools/chrome_fuzz.cpp',
       ],
       'dependencies': [
@@ skipping 162 matching lines @@
       ],
       'include_dirs': [
         '../include/core',
       ],
       'dependencies': [
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
+        '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': [
         '../tools/gpuveto.cpp',
       ],
       'include_dirs': [
         '../include/private',
         '../src/core/',
         '../src/images',
       ],
       'dependencies': [
+        'lazy_decode_bitmap',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'lua_app',
       'type': 'executable',
       'sources': [
         '../tools/lua/lua_app.cpp',
         '../src/utils/SkLua.cpp',
@@ skipping 21 matching lines @@
         '../src/utils/SkLuaCanvas.cpp',
         '../src/utils/SkLua.cpp',
       ],
       'include_dirs': [
         '../include/private',
         # Lua exposes GrReduceClip which in turn requires src/core for SkTLList
         '../src/gpu/',
         '../src/core/',
       ],
       'dependencies': [
+        'lazy_decode_bitmap',
         'effects.gyp:effects',
         'flags.gyp:flags',
         'images.gyp:images',
         'lua.gyp:lua',
         'tools.gyp:picture_utils',
         'pdf.gyp:pdf',
         'ports.gyp:ports',
         'skia_lib.gyp:skia_lib',
       ],
     },
@@ skipping 13 matching lines @@
         ],
       },
     },
     {
       'target_name': 'pinspect',
       'type': 'executable',
       'sources': [
         '../tools/pinspect.cpp',
       ],
       'dependencies': [
+        'lazy_decode_bitmap',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'imgconv',
       'type': 'executable',
       'sources': [
         '../tools/imgconv.cpp',
       ],
@@ skipping 210 matching lines @@
               'flags.gyp:flags',
               'skia_lib.gyp:skia_lib',
               'resources',
             ],
           },
         ],
       },
     ],
   ],
 }