Revert "delete old things!"

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 7c3cc2a21789faad5b2ce411491c0c839152e559..13416664fce6f4b2e2bfd070313f44dc6b23ed24 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -13,6 +13,7 @@
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
+        'bbh_shootout',
         'bench_pictures',
         'dump_record',
         'filter',
@@ -42,6 +43,22 @@
       ],
     },
     {
+      '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' ],
@@ -540,6 +557,26 @@
       ],
     },
     {
+      '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' : [