Reland https://codereview.chromium.org/286903025

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 268 matching lines @@
         'flags.gyp:flags',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_renderer',
         'tools.gyp:picture_utils',
       ],
     },
     {
       'target_name': 'bench_pictures',
       'type': 'executable',
       'sources': [
+        '../bench/ResultsWriter.cpp',
+        '../tools/PictureBenchmark.cpp',
+        '../tools/PictureResultsWriter.h',
         '../bench/SkBenchLogger.h',
         '../bench/SkBenchLogger.cpp',
-        '../bench/TimerData.h',
-        '../bench/TimerData.cpp',
         '../tools/bench_pictures_main.cpp',
-        '../tools/PictureBenchmark.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../bench',
         '../src/lazy/',
       ],
       'dependencies': [
         'bench.gyp:bench_timer',
         'flags.gyp:flags',
+        'jsoncpp.gyp:jsoncpp',
         'skia_lib.gyp:skia_lib',
         'tools.gyp:picture_utils',
         'tools.gyp:picture_renderer',
+        'tools.gyp:timer_data',
       ],
     },
     {
       'target_name': 'bench_record',
       'type': 'executable',
       'sources': [
         '../tools/bench_record.cpp',
         '../tools/LazyDecodeBitmap.cpp',
       ],
       'include_dirs': [
@@ skipping 181 matching lines @@
       'target_name': 'bbh_shootout',
       'type': 'executable',
       'include_dirs': [
         '../bench',
         '../tools/'
       ],
       'sources': [
         '../tools/bbh_shootout.cpp',
 
         # Bench code:
-        '../bench/TimerData.h',
-        '../bench/TimerData.cpp',
       ],
       'dependencies': [
         '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 18 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',
             ],
           },
         ],
       },
     ],
   ],
 }