Reland r8235 "Switch gm to use SkFlags."

gyp/tools.gyp

 # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
-# Building on other platforms not tested yet.
-#
 {
   'includes': [
     'apptype_console.gypi',
   ],
   'targets': [
     {
       # Build all executable targets defined below.
       'target_name': 'tools',
       'type': 'none',
       'dependencies': [
@@ skipping 41 matching lines @@
         'skia_base_libs.gyp:skia_base_libs',
         'effects.gyp:effects',
         'images.gyp:images',
       ],
     },
     {
       'target_name': 'skhello',
       'type': 'executable',
       'sources': [
         '../tools/skhello.cpp',
-        '../tools/SkFlags.h',
-        '../tools/SkFlags.cpp',
       ],
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
         'effects.gyp:effects',
+        'flags.gyp:flags',
         'images.gyp:images',
       ],
     },
     {
       'target_name': 'skimage',
       'type': 'executable',
       'sources': [
         '../tools/skimage_main.cpp',
       ],
       'dependencies': [
@@ skipping 45 matching lines @@
     {
       'target_name': 'picture_renderer',
       'type': 'static_library',
       'sources': [
         '../tools/PictureRenderer.h',
         '../tools/PictureRenderer.cpp',
         '../tools/PictureRenderingFlags.h',
         '../tools/PictureRenderingFlags.cpp',
         '../tools/CopyTilesRenderer.h',
         '../tools/CopyTilesRenderer.cpp',
-        '../tools/SkFlags.h',
-        '../tools/SkFlags.cpp',
         '../src/pipe/utils/SamplePipeControllers.h',
         '../src/pipe/utils/SamplePipeControllers.cpp',
       ],
       'include_dirs': [
         '../src/core/',
         '../src/pipe/utils/',
         '../src/utils/',
       ],
       'dependencies': [
         'skia_base_libs.gyp:skia_base_libs',
         'effects.gyp:effects',
         'images.gyp:images',
         'tools.gyp:picture_utils',
+        'flags.gyp:flags',
       ],
       'conditions': [
         ['skia_gpu == 1',
           {
             'include_dirs' : [
               '../src/gpu',
             ],
           },
         ],
       ],
@@ skipping 125 matching lines @@
       },
     ],
   ],
 }
 
 # Local Variables:
 # tab-width:2
 # indent-tabs-mode:nil
 # End:
 # vim: set expandtab tabstop=2 shiftwidth=2: