Revert of https://codereview.chromium.org/108343006/
Reason for revert: broke some builds

R=rmistry@google.com, mtklein@google.com
TBR=mtklein@google.com, rmistry@google.com
NOTREECHECKS=true
NOTRY=true
BUG=skia:1943

Author: epoger@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@12865 2bbb7eff-a529-9590-31e7-b0007b416f81
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index ce24d9d..f748157 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -13,18 +13,17 @@
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
-        'bbh_shootout',
         'bench_pictures',
         'filter',
-        'lua_app',
         'lua_pictures',
+        'bbh_shootout',
+        'lua_app',
         'pinspect',
         'render_pdfs',
         'render_pictures',
         'skdiff',
-        'skhello',
         'skpdiff',
-        'skpmaker',
+        'skhello',
         'skimage',
         'test_image_decoder',
       ],
@@ -111,20 +110,6 @@
       ],
     },
     {
-      'target_name': 'skpmaker',
-      'type': 'executable',
-      'sources': [
-        '../tools/skpmaker.cpp',
-      ],
-      'include_dirs': [
-        '../src/core',
-      ],
-      'dependencies': [
-        'flags.gyp:flags',
-        'skia_lib.gyp:skia_lib',
-      ],
-    },
-    {
       'target_name': 'skimagediff',
       'type': 'executable',
       'sources': [