move skpdiff into tools

R=djsollen@google.com

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

git-svn-id: http://skia.googlecode.com/svn/trunk@10249 2bbb7eff-a529-9590-31e7-b0007b416f81

experimental/skpdiff/skpdiff.gyp

@@ -1,70 +0,0 @@
-# GYP file to build skpdiff.
-#
-# To build on Linux:
-#  ./gyp_skia skpdiff.gyp && make skpdiff
-#
-{
-  'targets': [
-    {
-      'target_name': 'skpdiff',
-      'type': 'executable',
-      'sources': [
-        'main.cpp',
-        'SkDiffContext.cpp',
-        'SkImageDiffer.cpp',
-        'SkPMetric.cpp',
-        'skpdiff_util.cpp',
-        '../../tools/flags/SkCommandLineFlags.cpp',
-      ],
-      'include_dirs': [
-        '../../tools/flags'
-      ],
-      'dependencies': [
-        '../../gyp/skia_lib.gyp:skia_lib',
-      ],
-      'cflags': [
-        '-O3',
-      ],
-      'conditions': [
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
-          'link_settings': {
-            'libraries': [
-              '-lrt',
-            ],
-          },
-        }],
-        ['skia_opencl', {
-          'sources': [
-            'SkCLImageDiffer.cpp',
-            'SkDifferentPixelsMetric_opencl.cpp',
-          ],
-          'conditions': [
-            [ 'skia_os == "mac"', {
-              'link_settings': {
-                'libraries': [
-                  '$(SDKROOT)/System/Library/Frameworks/OpenCL.framework',
-                ]
-              }
-            }, {
-              'link_settings': {
-                'libraries': [
-                  '-lOpenCL',
-                ],
-              },
-            }],
-          ],
-        }, { # !skia_opencl
-          'sources': [
-            'SkDifferentPixelsMetric_cpu.cpp',
-          ],
-        }],
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

gyp/tools.gyp

@@ -21,6 +21,7 @@
         'render_pdfs',
         'render_pictures',
         'skdiff',
+        'skpdiff',
         'skhello',
         'skimage',
       ],
@@ -50,6 +51,61 @@
         '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',