Move BenchTimer to tools as Timer

gyp/bench.gyp

Index: gyp/bench.gyp
diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index 15927e641300d012b57ded829cbfbad7fe72958b..1c1943705fcdd10ed7d3131f71380568243b3dc8 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -9,13 +9,13 @@
       'target_name': 'bench',
       'type': 'executable',
       'dependencies': [
-        'bench_timer',
-        'crash_handler.gyp:CrashHandler',
         'etc1.gyp:libetc1',
         'flags.gyp:flags',
         'jsoncpp.gyp:jsoncpp',
-        'resources.gyp:resources',
         'skia_lib.gyp:skia_lib',
+        'tools.gyp:crash_handler',
+        'tools.gyp:resources',
+        'tools.gyp:timer',
       ],
       'sources': [
         '../bench/BenchLogger.cpp',
@@ -50,63 +50,5 @@
         'gmslides.gypi',
       ],
     },
-    {
-      'target_name' : 'bench_timer',
-      'type': 'static_library',
-      'sources': [
-        '../bench/BenchTimer.h',
-        '../bench/BenchTimer.cpp',
-        '../bench/BenchSysTimer_mach.h',
-        '../bench/BenchSysTimer_mach.cpp',
-        '../bench/BenchSysTimer_posix.h',
-        '../bench/BenchSysTimer_posix.cpp',
-        '../bench/BenchSysTimer_windows.h',
-        '../bench/BenchSysTimer_windows.cpp',
-      ],
-      'include_dirs': [
-        '../src/core',
-        '../src/gpu',
-        '../tools',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': ['../bench'],
-      },
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-      ],
-      'conditions': [
-        [ 'skia_os not in ["mac", "ios"]', {
-          'sources!': [
-            '../bench/BenchSysTimer_mach.h',
-            '../bench/BenchSysTimer_mach.cpp',
-          ],
-        }],
-        [ 'skia_os not in ["linux", "freebsd", "openbsd", "solaris", "android", "chromeos"]', {
-          'sources!': [
-            '../bench/BenchSysTimer_posix.h',
-            '../bench/BenchSysTimer_posix.cpp',
-          ],
-        }],
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
-          'link_settings': {
-            'libraries': [
-              '-lrt',
-            ],
-          },
-        }],
-        [ 'skia_os != "win"', {
-          'sources!': [
-            '../bench/BenchSysTimer_windows.h',
-            '../bench/BenchSysTimer_windows.cpp',
-          ],
-        }],
-        ['skia_gpu == 1', {
-          'sources': [
-            '../bench/BenchGpuTimer_gl.h',
-            '../bench/BenchGpuTimer_gl.cpp',
-          ],
-        }],
-      ],
-    }
   ],
 }