Revert "delete old things!"

gyp/tools.gyp

     # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       # Build all executable targets defined below.
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
+        'bbh_shootout',
         'bench_pictures',
         'dump_record',
         'filter',
         'gpuveto',
         'lua_app',
         'lua_pictures',
         'imgconv',
         'pinspect',
         'render_pdfs',
         'render_pictures',
         'skdiff',
         'skhello',
         'skpdiff',
         'skpinfo',
         'skpmaker',
         'test_image_decoder',
         'test_public_includes',
       ],
       'conditions': [
         ['skia_shared_lib',
           {
             'dependencies': [
               'sklua', # This can only be built if skia is built as a shared library
             ],
           },
         ],
       ],
     },
     {
+      'target_name': 'gm_expectations',
+      'type': 'static_library',
+      'include_dirs' : [ '../src/utils/' ],
+      'sources': [
+        '../gm/gm_expectations.cpp',
+      ],
+      'dependencies': [
+        'jsoncpp.gyp:jsoncpp',
+        'sk_tool_utils',
+        'skia_lib.gyp:skia_lib',
+      ],
+      'direct_dependent_settings': {
+        'include_dirs': [ '../gm/' ],
+      },
+    },
+    {
       'target_name': 'crash_handler',
         'type': 'static_library',
         'sources': [ '../tools/CrashHandler.cpp' ],
         'dependencies': [ 'skia_lib.gyp:skia_lib' ],
         'direct_dependent_settings': {
           'include_dirs': [ '../tools' ],
         },
         'all_dependent_settings': {
           'msvs_settings': {
             'VCLinkerTool': {
@@ skipping 478 matching lines @@
       'type': 'executable',
       'sources': [
         '../tools/imgconv.cpp',
       ],
       'dependencies': [
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
+      'target_name': 'bbh_shootout',
+      'type': 'executable',
+      'include_dirs': [
+        '../bench',
+        '../tools/'
+      ],
+      'sources': [
+        '../tools/bbh_shootout.cpp',
+
+        # Bench code:
+      ],
+      'dependencies': [
+        'timer',
+        'flags.gyp:flags',
+        'skia_lib.gyp:skia_lib',
+        'tools.gyp:picture_renderer',
+        'tools.gyp:picture_utils',
+      ],
+    },
+    {
       'target_name': 'filter',
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
         '../src/utils/debugger',
       ],
       'sources': [
         '../tools/filtermain.cpp',
         '../src/utils/debugger/SkDrawCommand.h',
         '../src/utils/debugger/SkDrawCommand.cpp',
@@ skipping 182 matching lines @@
               'flags.gyp:flags',
               'skia_lib.gyp:skia_lib',
               'resources',
             ],
           },
         ],
       },
     ],
   ],
 }