Fold bench source file list into bench.gyp.

gyp/bench.gyp

 # GYP file to build performance testbench.
 #
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       'target_name': 'bench',
       'type': 'executable',
       'include_dirs' : [
         '../src/core',
         '../src/effects',
         '../src/utils',
       ],
-      'includes': [
-        'bench.gypi'
-      ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
         'bench_timer',
         'flags.gyp:flags',
       ],
+      'sources': [
+        '../bench/AAClipBench.cpp',
+        '../bench/BicubicBench.cpp',
+        '../bench/BitmapBench.cpp',
+        '../bench/BitmapRectBench.cpp',
+        '../bench/BitmapScaleBench.cpp',
+        '../bench/BlurBench.cpp',
+        '../bench/BlurImageFilterBench.cpp',
+        '../bench/BlurRectBench.cpp',
+        '../bench/BlurRoundRectBench.cpp',
+        '../bench/ChartBench.cpp',
+        '../bench/ChecksumBench.cpp',
+        '../bench/ChromeBench.cpp',
+        '../bench/CmapBench.cpp',
+        '../bench/ColorFilterBench.cpp',
+        '../bench/CoverageBench.cpp',
+        '../bench/DashBench.cpp',
+        '../bench/DecodeBench.cpp',
+        '../bench/DeferredCanvasBench.cpp',
+        '../bench/DeferredSurfaceCopyBench.cpp',
+        '../bench/DisplacementBench.cpp',
+        '../bench/FSRectBench.cpp',
+        '../bench/FontCacheBench.cpp',
+        '../bench/FontScalerBench.cpp',
+        '../bench/GameBench.cpp',
+        '../bench/GrMemoryPoolBench.cpp',
+        '../bench/GrResourceCacheBench.cpp',
+        '../bench/GradientBench.cpp',
+        '../bench/HairlinePathBench.cpp',
+        '../bench/ImageCacheBench.cpp',
+        '../bench/ImageDecodeBench.cpp',
+        '../bench/InterpBench.cpp',
+        '../bench/LightingBench.cpp',
+        '../bench/LineBench.cpp',
+        '../bench/MagnifierBench.cpp',
+        '../bench/MathBench.cpp',
+        '../bench/Matrix44Bench.cpp',
+        '../bench/MatrixBench.cpp',
+        '../bench/MatrixConvolutionBench.cpp',
+        '../bench/MemoryBench.cpp',
+        '../bench/MemsetBench.cpp',
+        '../bench/MergeBench.cpp',
+        '../bench/MorphologyBench.cpp',
+        '../bench/MutexBench.cpp',
+        '../bench/PathBench.cpp',
+        '../bench/PathIterBench.cpp',
+        '../bench/PathUtilsBench.cpp',
+        '../bench/PerlinNoiseBench.cpp',
+        '../bench/PicturePlaybackBench.cpp',
+        '../bench/PictureRecordBench.cpp',
+        '../bench/PremulAndUnpremulAlphaOpsBench.cpp',
+        '../bench/RTreeBench.cpp',
+        '../bench/ReadPixBench.cpp',
+        '../bench/RectBench.cpp',
+        '../bench/RectoriBench.cpp',
+        '../bench/RefCntBench.cpp',
+        '../bench/RegionBench.cpp',
+        '../bench/RegionContainBench.cpp',
+        '../bench/RepeatTileBench.cpp',
+        '../bench/ScalarBench.cpp',
+        '../bench/ShaderMaskBench.cpp',
+        '../bench/SkBenchmark.cpp',

[mtklein, 2013/11/25 13:17:37]

Can you put these two SkBenchmark files down with SkBenchLogger too?  I'd like
to take the opportunity to visually distinguish the benchmarks themselves from
the bench framework.

[tfarina, 2013/11/26 15:41:08]

Do you mind if we split this in two targets? Say, bench_lib (or a better name
you have) for the framework and bench (or bench_exe) for the executable? 

[mtklein, 2013/11/26 15:45:18]

Let's wait to do this until something wants to depend on bench_lib without
bench_exe or vice versa.

On 2013/11/26 15:41:08, tfarina wrote:

+        '../bench/SkBenchmark.h',
+        '../bench/SkipZeroesBench.cpp',
+        '../bench/SortBench.cpp',
+        '../bench/StrokeBench.cpp',
+        '../bench/TableBench.cpp',
+        '../bench/TextBench.cpp',
+        '../bench/TileBench.cpp',
+        '../bench/VertBench.cpp',
+        '../bench/WritePixelsBench.cpp',
+        '../bench/WriterBench.cpp',
+        '../bench/XfermodeBench.cpp',
+        '../bench/benchmain.cpp',

[mtklein, 2013/11/25 13:17:37]

And this one?

[tfarina, 2013/11/26 15:41:08]

See question above. We may just put this in a separate target.

+
+        '../bench/SkBenchLogger.h',
+        '../bench/SkBenchLogger.cpp',
+      ],
       'conditions': [
         ['skia_gpu == 1',
           {
             'include_dirs' : [
               '../src/gpu',
             ],
           },
         ],
       ],
     },
@@ skipping 52 matching lines @@
       ],
     }
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: