Revert of Move BenchTimer to tools as Timer

gyp/tools.gyp

 # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
@@ skipping 25 matching lines @@
       'conditions': [
         ['skia_shared_lib',
           {
             'dependencies': [
               'sklua', # This can only be built if skia is built as a shared library
             ],
           },
         ],
       ],
     },
-    {  # 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' ] },
-        }],
-      ],
-    },
-    {
       'target_name': 'skdiff',
       'type': 'executable',
       'sources': [
         '../tools/skdiff.cpp',
         '../tools/skdiff.h',
         '../tools/skdiff_html.cpp',
         '../tools/skdiff_html.h',
         '../tools/skdiff_main.cpp',
         '../tools/skdiff_utils.cpp',
         '../tools/skdiff_utils.h',
@@ skipping 114 matching lines @@
       'target_name': 'skimage',
       'type': 'executable',
       'sources': [
         '../tools/skimage_main.cpp',
       ],
       'include_dirs': [
         # For SkBitmapHasher.h
         '../src/utils/',
       ],
       'dependencies': [
-        'gm_expectations',
         'flags.gyp:flags',
+        'gm.gyp:gm_expectations',
         'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'skpinfo',
       'type': 'executable',
       'sources': [
         '../tools/skpinfo.cpp',
       ],
@@ skipping 99 matching lines @@
         '../tools/PictureBenchmark.cpp',
         '../tools/PictureResultsWriter.h',
         '../tools/bench_pictures_main.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../bench',
         '../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',
       ],
     },
     {
       'target_name': 'bench_record',
       'type': 'executable',
       'sources': [
         '../tools/bench_record.cpp',
         '../tools/LazyDecodeBitmap.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../src/images',
         '../src/lazy',
       ],
       'dependencies': [
-        'timer',
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'bench_playback',
       'type': 'executable',
       'sources': [
         '../tools/bench_playback.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../src/images',
       ],
       'dependencies': [
-        'timer',
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'dump_record',
       'type': 'executable',
       'sources': [
         '../tools/dump_record.cpp',
         '../tools/DumpRecord.cpp',
         '../tools/LazyDecodeBitmap.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../src/images',
         '../src/lazy',
       ],
       'dependencies': [
-        'timer',
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'picture_renderer',
       'type': 'static_library',
       'sources': [
         '../tools/image_expectations.h',
         '../tools/image_expectations.cpp',
@@ skipping 127 matching lines @@
       'include_dirs': [
         '../bench',
         '../tools/'
       ],
       'sources': [
         '../tools/bbh_shootout.cpp',
 
         # Bench code:
       ],
       'dependencies': [
-        'timer',
+        'bench.gyp:bench_timer',
         'flags.gyp:flags',
+        'tools.gyp:timer_data',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
       ],
     },
     {
       'target_name': 'filter',
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
@@ skipping 16 matching lines @@
     {
       'target_name': 'test_image_decoder',
       'type': 'executable',
       'sources': [
         '../tools/test_image_decoder.cpp',
       ],
       'dependencies': [
         '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',
       {
         'targets': [
           {
             'target_name': 'sklua',
             'product_name': 'skia',
             'product_prefix': '',
             'product_dir': '<(PRODUCT_DIR)/',
@@ skipping 51 matching lines @@
             'type': 'executable',
             'sources': [
               '../tools/win_lcid.cpp',
             ],
           },
         ],
       },
     ],
   ],
 }