Revert of Move SkGLContext and some GrGLInterface implementations to skgputest module

gyp/gputest.gyp

Index: gyp/gputest.gyp
diff --git a/gyp/gputest.gyp b/gyp/gputest.gyp
index af812a19862a6da9f451a9432c318ffe4e89b88a..36db43403f7d967250c1eaabcc70ab45d35b7c05 100644
--- a/gyp/gputest.gyp
+++ b/gyp/gputest.gyp
@@ -9,85 +9,28 @@
       'product_name': 'skia_skgputest',
       'type': 'static_library',
       'standalone_static_library': 1,
+      'dependencies': [
+        'skia_lib.gyp:skia_lib',
+      ],
       'include_dirs': [
-        '../include/core',
-        '../include/config',
         '../include/gpu',
         '../include/private',
         '../include/utils',
         '../src/core',
         '../src/gpu',
-        '../src/utils',
-        '../tools/gpu',
+        '../../src/gpu',
       ],
-      'all_dependent_settings': {
+      'direct_dependent_settings': {
         'include_dirs': [
-          '../tools/gpu',
+          '../src/gpu',
+          '../../src/gpu',
         ],
       },
-      'dependencies': [
-        'gpu.gyp:skgpu',
-      ],
       'sources': [
-        '<!@(python find.py ../tools/gpu "*")'
-      ],
-      'conditions': [
-        [ 'skia_mesa and skia_os == "linux"', {
-          'link_settings': {
-            'libraries': [
-              '-lOSMesa',
-            ],
-          },
-        }],
-        [ 'skia_mesa and skia_os == "mac"', {
-          'link_settings': {
-            'libraries': [
-              '/opt/X11/lib/libOSMesa.dylib',
-            ],
-          },
-          'include_dirs': [
-             '/opt/X11/include/',
-          ],
-        }],
-        [ 'skia_angle', {
-          'dependencies': [
-            'angle.gyp:*',
-          ],
-          'export_dependent_settings': [
-            'angle.gyp:*',
-          ],
-        }],
-        ['skia_os != "win"', {
-          'sources/': [ ['exclude', '_win\.(h|cpp)$'],],
-        }],
-        ['skia_os != "mac"', {
-          'sources/': [ ['exclude', '_mac\.(h|cpp|m|mm)$'],],
-        }],
-        ['skia_os != "linux" and skia_os != "chromeos"', {
-          'sources/': [ ['exclude', '_glx\.(h|cpp)$'],],
-        }],
-        ['skia_os != "ios"', {
-          'sources/': [ ['exclude', '_iOS\.(h|cpp|m|mm)$'],],
-        }],
-        ['skia_os != "android"', {
-          'sources/': [ ['exclude', '_android\.(h|cpp)$'],],
-        }],
-        ['skia_egl == 0', {
-          'sources/': [ ['exclude', '_egl\.(h|cpp)$'],],
-        }],
-        [ 'skia_mesa == 0', {
-          'sources/': [
-            ['exclude', '_mesa\.(h|cpp)$'],
-          ],
-        }],
-        [ 'skia_angle == 0', {
-          'sources/': [
-            ['exclude', '_angle\.(h|cpp)$'],
-          ],
-        }],
-        [ 'skia_command_buffer == 0', {
-          'sources/': [ ['exclude', '_command_buffer\.(h|cpp)$'], ],
-        }],
+        '<(skia_src_path)/gpu/GrContextFactory.cpp',
+        '<(skia_src_path)/gpu/GrContextFactory.h',
+        '<(skia_src_path)/gpu/GrTest.cpp',
+        '<(skia_src_path)/gpu/GrTest.h',
       ],
     },
   ],