gyp: add osmesa target to factor out common code

gyp/tools.gyp

Index: gyp/tools.gyp
diff --git a/gyp/tools.gyp b/gyp/tools.gyp
index 8af0dfd1acc88549131abef24a5c279b6dd1994c..cd9223335f263bc0e986b9e9f0f12b8e406e87be 100644
--- a/gyp/tools.gyp
+++ b/gyp/tools.gyp
@@ -351,7 +351,7 @@
         '../tools/picture_utils.cpp',
         '../tools/picture_utils.h',
       ],
-	  'include_dirs': [
+      'include_dirs': [
           '../src/core/',
       ],
       'dependencies': [
@@ -608,18 +608,9 @@
             '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' ], },
-                }
-              ],
-            ],
           },
         ],
       },