Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

gyp/gpu.gypi

 # Copyright 2015 Google Inc.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 # Include this gypi to include all 'gpu' files
 # The parent gyp/gypi file must define
 #       'skia_src_path'     e.g. skia/trunk/src
 #       'skia_include_path' e.g. skia/trunk/include
 #
 # The skia build defines these in common_variables.gypi
@@ skipping 300 matching lines @@
 
       '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLAssembleInterface.h',
       '<(skia_src_path)/gpu/gl/GrGLBuffer.cpp',
       '<(skia_src_path)/gpu/gl/GrGLBuffer.h',
       '<(skia_src_path)/gpu/gl/GrGLCaps.cpp',
       '<(skia_src_path)/gpu/gl/GrGLCaps.h',
       '<(skia_src_path)/gpu/gl/GrGLContext.cpp',
       '<(skia_src_path)/gpu/gl/GrGLContext.h',
       '<(skia_src_path)/gpu/gl/GrGLCreateNativeInterface_none.cpp',
-      '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_none.cpp',
       '<(skia_src_path)/gpu/gl/GrGLDefines.h',
       '<(skia_src_path)/gpu/gl/GrGLGLSL.cpp',
       '<(skia_src_path)/gpu/gl/GrGLGLSL.h',
       '<(skia_src_path)/gpu/gl/GrGLGpu.cpp',
       '<(skia_src_path)/gpu/gl/GrGLGpu.h',
       '<(skia_src_path)/gpu/gl/GrGLGpuProgramCache.cpp',
       '<(skia_src_path)/gpu/gl/GrGLExtensions.cpp',
       '<(skia_src_path)/gpu/gl/GrGLInterface.cpp',
       '<(skia_src_path)/gpu/gl/GrGLIRect.h',
@@ skipping 70 matching lines @@
       '<(skia_src_path)/gpu/glsl/GrGLSLVertexShaderBuilder.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLVertexShaderBuilder.h',
       '<(skia_src_path)/gpu/glsl/GrGLSLXferProcessor.cpp',
       '<(skia_src_path)/gpu/glsl/GrGLSLXferProcessor.h',
 
       # Sk files
       '<(skia_include_path)/gpu/SkGr.h',
       '<(skia_include_path)/gpu/SkGrPixelRef.h',
       '<(skia_include_path)/gpu/SkGrTexturePixelRef.h',
 
+      '<(skia_include_path)/gpu/gl/SkGLContext.h',
+
       '<(skia_src_path)/gpu/SkGpuDevice.cpp',
       '<(skia_src_path)/gpu/SkGpuDevice.h',
       '<(skia_src_path)/gpu/SkGpuDevice_drawTexture.cpp',
       '<(skia_src_path)/gpu/SkGr.cpp',
       '<(skia_src_path)/gpu/SkGrPixelRef.cpp',
       '<(skia_src_path)/gpu/SkGrPriv.h',
       '<(skia_src_path)/gpu/SkGrTexturePixelRef.cpp',
 
       '<(skia_src_path)/image/SkImage_Gpu.h',
       '<(skia_src_path)/image/SkImage_Gpu.cpp',
       '<(skia_src_path)/image/SkSurface_Gpu.h',
       '<(skia_src_path)/image/SkSurface_Gpu.cpp',
+
+      '<(skia_src_path)/gpu/gl/SkGLContext.cpp'
     ],
     'skgpu_vk_sources': [
       '<(skia_include_path)/gpu/vk/GrVkBackendContext.h',
       '<(skia_include_path)/gpu/vk/GrVkDefines.h',
       '<(skia_include_path)/gpu/vk/GrVkInterface.h',
       '<(skia_include_path)/gpu/vk/GrVkTypes.h',
       '<(skia_src_path)/gpu/vk/GrVkBackendContext.cpp',
       '<(skia_src_path)/gpu/vk/GrVkBuffer.cpp',
       '<(skia_src_path)/gpu/vk/GrVkBuffer.h',
       '<(skia_src_path)/gpu/vk/GrVkCaps.cpp',
@@ skipping 57 matching lines @@
       '<(skia_src_path)/gpu/vk/GrVkVertexBuffer.h',
     ],
     'skgpu_native_gl_sources': [
       '<(skia_src_path)/gpu/gl/GrGLDefaultInterface_native.cpp',
       '<(skia_src_path)/gpu/gl/mac/GrGLCreateNativeInterface_mac.cpp',
       '<(skia_src_path)/gpu/gl/win/GrGLCreateNativeInterface_win.cpp',
       '<(skia_src_path)/gpu/gl/glx/GrGLCreateNativeInterface_glx.cpp',
       '<(skia_src_path)/gpu/gl/egl/GrGLCreateNativeInterface_egl.cpp',
       '<(skia_src_path)/gpu/gl/iOS/GrGLCreateNativeInterface_iOS.cpp',
       '<(skia_src_path)/gpu/gl/android/GrGLCreateNativeInterface_android.cpp',
+
+      # Sk files
+      '<(skia_src_path)/gpu/gl/mac/SkCreatePlatformGLContext_mac.cpp',
+      '<(skia_src_path)/gpu/gl/win/SkCreatePlatformGLContext_win.cpp',
+      '<(skia_src_path)/gpu/gl/glx/SkCreatePlatformGLContext_glx.cpp',
+      '<(skia_src_path)/gpu/gl/egl/SkCreatePlatformGLContext_egl.cpp',
+      '<(skia_src_path)/gpu/gl/iOS/SkCreatePlatformGLContext_iOS.mm',
+    ],
+    'skgpu_mesa_gl_sources': [
+      '<(skia_src_path)/gpu/gl/mesa/GrGLCreateMesaInterface.cpp',
+
+      # Sk files
+      '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/mesa/SkMesaGLContext.h',
+    ],
+    'skgpu_angle_gl_sources': [
+      '<(skia_src_path)/gpu/gl/angle/GrGLCreateANGLEInterface.cpp',
+
+      # Sk files
+      '<(skia_include_path)/gpu/gl/angle/SkANGLEGLContext.h',
+      '<(skia_src_path)/gpu/gl/angle/SkANGLEGLContext.cpp',
+    ],
+    'skgpu_command_buffer_gl_sources': [
+      # Sk files
+      '<(skia_include_path)/gpu/gl/command_buffer/SkCommandBufferGLContext.h',
+      '<(skia_src_path)/gpu/gl/command_buffer/SkCommandBufferGLContext.cpp',
+    ],
+    'skgpu_debug_gl_sources': [
+      '<(skia_src_path)/gpu/gl/debug/GrGLCreateDebugInterface.cpp',
+      '<(skia_src_path)/gpu/gl/debug/GrFakeRefObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrBufferObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrBufferObj.cpp',
+      '<(skia_src_path)/gpu/gl/debug/GrFBBindableObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrRenderBufferObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrTextureObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrTextureObj.cpp',
+      '<(skia_src_path)/gpu/gl/debug/GrTextureUnitObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrTextureUnitObj.cpp',
+      '<(skia_src_path)/gpu/gl/debug/GrFrameBufferObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrFrameBufferObj.cpp',
+      '<(skia_src_path)/gpu/gl/debug/GrShaderObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrShaderObj.cpp',
+      '<(skia_src_path)/gpu/gl/debug/GrProgramObj.h',
+      '<(skia_src_path)/gpu/gl/debug/GrProgramObj.cpp',
+      '<(skia_src_path)/gpu/gl/debug/GrVertexArrayObj.h',
+
+      # Sk files
+      '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.cpp',
+      '<(skia_src_path)/gpu/gl/debug/SkDebugGLContext.h',
+    ],
+    'skgpu_null_gl_sources': [
+      '<(skia_src_path)/gpu/gl/GrGLCreateNullInterface.cpp',
+      '<(skia_src_path)/gpu/gl/SkNullGLContext.cpp',
+      '<(skia_include_path)/gpu/gl/SkNullGLContext.h',
     ],
   },
 }