Add benchmarkstream to visualbench

gyp/visualbench.gyp

Index: gyp/visualbench.gyp
diff --git a/gyp/visualbench.gyp b/gyp/visualbench.gyp
index 874b0aafa0170f1bf2cccb80b2cc36768fb3c3ae..4bf559ae98fab5689dcb3b464f57a6bb55d29c84 100644
--- a/gyp/visualbench.gyp
+++ b/gyp/visualbench.gyp
@@ -11,19 +11,37 @@
     {
       'target_name': 'visualbench',
       'type': 'executable',
+      'includes' : [
+        'gmslides.gypi',
+      ],
       'include_dirs' : [
+        '../bench',
         '../include/gpu',
         '../src/core',
+        '../src/effects',
         '../src/images',
       ],
       'sources': [
+        '../gm/gm.cpp',
         '../tools/VisualBench/VisualBench.h',
         '../tools/VisualBench/VisualBench.cpp',
+        '../tools/VisualBench/VisualBenchmarkStream.h',
+        '../tools/VisualBench/VisualBenchmarkStream.cpp',
+        '../tools/VisualBench/VisualSKPBench.h',
+        '../tools/VisualBench/VisualSKPBench.cpp',
+        '<!@(python find.py ../bench "*.cpp")',
+      ],
+      'sources!': [
+        '../bench/nanobench.cpp',
+        '../bench/nanobenchAndroid.cpp',
       ],
       'dependencies': [
-        'flags.gyp:flags_common',
+        'etc1.gyp:libetc1',
+        'flags.gyp:flags',
+        'gputest.gyp:skgputest', 
         'skia_lib.gyp:skia_lib',
         'tools.gyp:proc_stats',
+        'tools.gyp:sk_tool_utils',
         'tools.gyp:timer',
         'views.gyp:views',
       ],