Revert of Move BenchTimer to tools as Timer

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index eeb210a4970a3d15e81acff02a9c58f3d8874a97..5ea127296ae495935da7b0fc984ead95cda3ef51 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -41,86 +41,6 @@
             ],
           },
         ],
-      ],
-    },
-    {  # This would go in gm.gyp, but it's also used by skimage below.
-      'target_name': 'gm_expectations',
-      'type': 'static_library',
-      'include_dirs' : [ '../src/utils/' ],
-      'sources': [
-        '../gm/gm_expectations.cpp',
-        '../tools/sk_tool_utils.cpp',
-      ],
-      'dependencies': [
-        'jsoncpp.gyp:jsoncpp',
-        'skia_lib.gyp:skia_lib',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [ '../gm/' ],
-      },
-    },
-    {
-      'target_name': 'crash_handler',
-        'type': 'static_library',
-        'sources': [ '../tools/CrashHandler.cpp' ],
-        'dependencies': [ 'skia_lib.gyp:skia_lib' ],
-        'direct_dependent_settings': {
-          'include_dirs': [ '../tools' ],
-        },
-        'all_dependent_settings': {
-          'msvs_settings': {
-            'VCLinkerTool': {
-              'AdditionalDependencies': [ 'Dbghelp.lib' ],
-            }
-          },
-        }
-    },
-    {
-      'target_name': 'resources',
-      'type': 'static_library',
-      'sources': [ '../tools/Resources.cpp' ],
-      'dependencies': [
-        'flags.gyp:flags',
-        'skia_lib.gyp:skia_lib',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': [ '../tools/', ],
-      },
-    },
-    {
-      'target_name' : 'timer',
-      'type': 'static_library',
-      'sources': [
-        '../tools/timer/Timer.cpp',
-        '../tools/timer/TimerData.cpp',
-      ],
-      'include_dirs': [
-        '../src/core',
-        '../src/gpu',
-      ],
-      'direct_dependent_settings': {
-        'include_dirs': ['../tools/timer'],
-      },
-      'dependencies': [
-        'skia_lib.gyp:skia_lib',
-        'jsoncpp.gyp:jsoncpp',
-      ],
-      'conditions': [
-        ['skia_gpu == 1', {
-          'sources': [ '../tools/timer/GpuTimer.cpp' ],
-        }],
-        [ 'skia_os in ["mac", "ios"]', {
-          'sources': [ '../tools/timer/SysTimer_mach.cpp' ],
-        }],
-        [ 'skia_os == "win"', {
-          'sources': [ '../tools/timer/SysTimer_windows.cpp' ],
-        }],
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "android", "chromeos"]', {
-          'sources': [ '../tools/timer/SysTimer_posix.cpp' ],
-        }],
-        [ 'skia_os in ["linux", "freebsd", "openbsd", "solaris", "chromeos"]', {
-          'link_settings': { 'libraries': [ '-lrt' ] },
-        }],
       ],
     },
     {
@@ -258,8 +178,8 @@
         '../src/utils/',
       ],
       'dependencies': [
-        'gm_expectations',
-        'flags.gyp:flags',
+        'flags.gyp:flags',
+        'gm.gyp:gm_expectations',
         'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',
       ],
@@ -379,13 +299,14 @@
         '../src/lazy/',
       ],
       'dependencies': [
-        'timer',
-        'crash_handler',
+        'bench.gyp:bench_timer',
+        'crash_handler.gyp:CrashHandler',
         'flags.gyp:flags',
         'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
+        'tools.gyp:timer_data',
       ],
     },
     {
@@ -401,7 +322,7 @@
         '../src/lazy',
       ],
       'dependencies': [
-        'timer',
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
@@ -417,7 +338,7 @@
         '../src/images',
       ],
       'dependencies': [
-        'timer',
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
@@ -436,7 +357,7 @@
         '../src/lazy',
       ],
       'dependencies': [
-        'timer',
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
@@ -584,8 +505,9 @@
         # Bench code:
       ],
       'dependencies': [
-        'timer',
-        'flags.gyp:flags',
+        'bench.gyp:bench_timer',
+        'flags.gyp:flags',
+        'tools.gyp:timer_data',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
@@ -622,6 +544,17 @@
         'skia_lib.gyp:skia_lib',
       ],
     },
+    {
+      'target_name': 'timer_data',
+      'type': 'static_library',
+      'sources': [
+        '../bench/TimerData.cpp',
+      ],
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+        'jsoncpp.gyp:jsoncpp'
+      ]
+    }
   ],
   'conditions': [
     ['skia_shared_lib',