gyp: add osmesa target to factor out common code

gyp/tools.gyp

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
     # GYP file to build various tools.
 #
 # To build on Linux:
 #  ./gyp_skia tools.gyp && make tools
 #
 {
@@ skipping 333 matching lines @@
         'skia_lib.gyp:skia_lib',
       ],
     },
     {
       'target_name': 'picture_utils',
       'type': 'static_library',
       'sources': [
         '../tools/picture_utils.cpp',
         '../tools/picture_utils.h',
       ],
-          'include_dirs': [
+      'include_dirs': [
           '../src/core/',
       ],
       'dependencies': [
         'skia_lib.gyp:skia_lib',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '../tools/',
         ],
       },
@@ skipping 236 matching lines @@
             'target_name': 'fiddle_build_test',
             'type': 'executable',
             'sources': [
               '../tools/fiddle/draw.cpp',
               '../tools/fiddle/fiddle_main.cpp',
               '../tools/fiddle/fiddle_main.h',
             ],
             'dependencies': [
               'skia_lib.gyp:skia_lib',
               'pdf.gyp:pdf',
+              'gputest.gyp:osmesa',
             ],
             'defines': [ 'FIDDLE_BUILD_TEST' ],
-            'conditions': [
-              [ 'skia_os == "mac"',
-                {
-                  'link_settings': { 'libraries': [ '/opt/X11/lib/libOSMesa.dylib', ], },
-                  'include_dirs': [ '/opt/X11/include/', ],
-                }, {
-                  'link_settings': { 'libraries': [ '-lOSMesa' ], },
-                }
-              ],
-            ],
           },
         ],
       },
     ],
   ],
 }