Fold bench source file list into bench.gyp.

gyp/bench.gyp

Index: gyp/bench.gyp
diff --git a/gyp/bench.gyp b/gyp/bench.gyp
index 040f7a4fcf217f145335ff4ac3ab2e9b8ea06897..595d77cd54bd61622d3e3ff8fff0f720512d2127 100644
--- a/gyp/bench.gyp
+++ b/gyp/bench.gyp
@@ -13,14 +13,89 @@
         '../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/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/SkBenchLogger.cpp',
+        '../bench/SkBenchLogger.h',
+        '../bench/SkBenchmark.cpp',
+        '../bench/SkBenchmark.h',
+        '../bench/benchmain.cpp',
+      ],
       'conditions': [
         ['skia_gpu == 1',
           {