Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

gyp/gpu.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 for building gpu
 {
   'target_defaults': {
     'conditions': [
       ['skia_os != "win"', {
         'sources/': [ ['exclude', '_win.(h|cpp)$'],
@@ skipping 84 matching lines @@
       'include_dirs': [
         '../include/gpu',
         '../include/private',
         '../src/core',
         '../src/gpu',
         '../src/image/',
       ],
       'sources': [
         '<@(skgpu_sources)',
         '<@(skgpu_native_gl_sources)',
+        '<@(skgpu_angle_gl_sources)',
+        '<@(skgpu_command_buffer_gl_sources)',
+        '<@(skgpu_mesa_gl_sources)',
+        '<@(skgpu_debug_gl_sources)',
+        '<@(skgpu_null_gl_sources)',
         '<@(skgpu_vk_sources)',
         'gpu.gypi', # Makes the gypi appear in IDEs (but does not modify the build).
       ],
       'conditions': [
         [ 'skia_gpu_extra_dependency_path', {
           'dependencies' : [
               '<(skia_gpu_extra_dependency_path):*',
           ],
           'export_dependent_settings': [
             '<(skia_gpu_extra_dependency_path):*',
@@ skipping 24 matching lines @@
         }],
         [ '(skia_os == "linux" or skia_os == "chromeos") and skia_egl == 0', {
           'link_settings': {
             'libraries': [
               '-lGL',
               '-lGLU',
               '-lX11',
             ],
           },
         }],
+        [ 'skia_egl == 1', {
+          'defines': [
+            'SK_EGL=1',
+          ],
+        }],
+        [ 'skia_egl == 0', {
+          'defines': [
+            'SK_EGL=0',
+          ],
+        }],
+        [ 'skia_mesa and skia_os == "linux"', {
+          'link_settings': {
+            'libraries': [
+              '-lOSMesa',
+            ],
+          },
+        }],
         [ 'skia_os == "mac"', {
           'link_settings': {
             'libraries': [
               '$(SDKROOT)/System/Library/Frameworks/OpenGL.framework',
             ],
           },
           'sources!': [
             '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
             '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
           ],
         }],
+        [ 'not skia_mesa', {
+          'sources!': [
+            '../src/gpu/gl/mesa/SkMesaGLContext.cpp',
+            '../src/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
+          ],
+        }],
+        [ 'skia_mesa and skia_os == "mac"', {
+          'link_settings': {
+            'libraries': [
+              '/opt/X11/lib/libOSMesa.dylib',
+            ],
+          },
+          'include_dirs': [
+             '/opt/X11/include/',
+          ],
+        }],
         [ 'skia_os in ["win", "ios"]', {
           'sources!': [
             '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
             '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
           ],
         }],
+        [ 'skia_angle', {
+          'dependencies': [
+            'angle.gyp:*',
+          ],
+          'export_dependent_settings': [
+            'angle.gyp:*',
+          ],
+        }, { # not skia_angle
+          'sources!': [
+            '<@(skgpu_angle_gl_sources)',
+          ],
+        }],
+        [ 'skia_command_buffer', {
+        }, { # not skia_command_buffer
+          'sources!': [
+            '<@(skgpu_command_buffer_gl_sources)',
+          ],
+        }],
         [ 'skia_os == "android"', {
           'sources!': [
             '../src/gpu/gl/GrGLDefaultInterface_none.cpp',
             '../src/gpu/gl/GrGLCreateNativeInterface_none.cpp',
           ],
           'defines': [
             'GR_GL_USE_NEW_SHADER_SOURCE_SIGNATURE=1',
           ],
           'link_settings': {
             'libraries': [
@@ skipping 48 matching lines @@
           },
         }, {
           'sources!': [
             '<@(skgpu_vk_sources)',
           ],
         }],
       ],
     },
   ],
 }