move skpdiff into tools

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': [
         'bench_pictures',
         'filter',
         'bbh_shootout',
         'lua_app',
         'pinspect',
         'render_pdfs',
         'render_pictures',
         'skdiff',
+        'skpdiff',
         'skhello',
         'skimage',
       ],
       'conditions': [
         ['skia_shared_lib',
           {
             'dependencies': [
               'sklua', # This can only be built if skia is built as a shared library
             ],
           },
@@ skipping 10 matching lines @@
         '../tools/skdiff_html.h',
         '../tools/skdiff_main.cpp',
         '../tools/skdiff_utils.cpp',
         '../tools/skdiff_utils.h',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
+      'target_name': 'skpdiff',
+      'type': 'executable',
+      'sources': [
+        '../tools/skpdiff/skpdiff_main.cpp',
+        '../tools/skpdiff/SkDiffContext.cpp',
+        '../tools/skpdiff/SkImageDiffer.cpp',
+        '../tools/skpdiff/SkPMetric.cpp',
+        '../tools/skpdiff/skpdiff_util.cpp',
+        '../tools/flags/SkCommandLineFlags.cpp',
+      ],
+      'include_dirs': [
+        '../tools/flags'
+      ],
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+      ],
+      'cflags': [
+        '-O3',
+      ],
+      'conditions': [
+        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
+          'link_settings': {
+            'libraries': [
+              '-lrt',
+            ],
+          },
+        }],
+        ['skia_opencl', {
+          'sources': [
+            '../tools/skpdiff/SkCLImageDiffer.cpp',
+            '../tools/skpdiff/SkDifferentPixelsMetric_opencl.cpp',
+          ],
+          'conditions': [
+            [ 'skia_os == "mac"', {
+              'link_settings': {
+                'libraries': [
+                  '$(SDKROOT)/System/Library/Frameworks/OpenCL.framework',
+                ]
+              }
+            }, {
+              'link_settings': {
+                'libraries': [
+                  '-lOpenCL',
+                ],
+              },
+            }],
+          ],
+        }, { # !skia_opencl
+          'sources': [
+            '../tools/skpdiff/SkDifferentPixelsMetric_cpu.cpp',
+          ],
+        }],
+      ],
+    },
+    {
       'target_name': 'skimagediff',
       'type': 'executable',
       'sources': [
         '../tools/skdiff.cpp',
         '../tools/skdiff.h',
         '../tools/skdiff_html.cpp',
         '../tools/skdiff_html.h',
         '../tools/skdiff_image.cpp',
         '../tools/skdiff_utils.cpp',
         '../tools/skdiff_utils.h',
@@ skipping 347 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: