Inline GPU and opus GYP files into GN build.

gpu/gles2_conform_support/gles2_conform_support.gyp

Index: gpu/gles2_conform_support/gles2_conform_support.gyp
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
deleted file mode 100644
index 5f97bba044a935aee980f8131dad68d51f046481..0000000000000000000000000000000000000000
--- a/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
-# Use of this source code is governed by a BSD-style license that can be
-# found in the LICENSE file.
-
-{
-  'variables': {
-    'chromium_code': 1,
-    # These are defined here because we want to be able to compile them on
-    # the buildbots without needed the OpenGL ES 2.0 conformance tests
-    # which are not open source.
-    'bootstrap_sources_native': [
-      'native/main.cc',
-    ],
-   'conditions': [
-     ['OS=="linux" or OS=="win"', {
-       'bootstrap_sources_native': [
-         'native/egl_native.cc',
-       ],
-     }],
-   ],
-
-  },
-  'targets': [
-    {
-      # GN version: //gpu/gles2_conform_support/egl
-      'target_name': 'egl_native',
-      'type': 'static_library',
-      'dependencies': [
-        '../../base/base.gyp:base',
-	'../../gpu/command_buffer/command_buffer.gyp:gles2_utils',
-        '../../gpu/gpu.gyp:command_buffer_service',
-        '../../gpu/gpu.gyp:gles2_implementation_no_check',
-        '../../gpu/gpu.gyp:gpu',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-        '../../ui/base/ui_base.gyp:ui_base',
-        '../../ui/gfx/gfx.gyp:gfx_geometry',
-        '../../ui/gl/gl.gyp:gl',
-        '../../ui/gl/init/gl_init.gyp:gl_init',
-      ],
-      'sources': [
-        'egl/config.cc',
-        'egl/config.h',
-        'egl/context.cc',
-        'egl/context.h',
-        'egl/display.cc',
-        'egl/display.h',
-        'egl/egl.cc',
-        'egl/surface.cc',
-        'egl/surface.h',
-        'egl/test_support.cc',
-        'egl/test_support.h',
-        'egl/thread_state.cc',
-        'egl/thread_state.h',
-      ],
-      'defines': [
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-      # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
-      'msvs_disabled_warnings': [ 4267, ],
-    },
-    {
-      # GN version: //gpu/gles2_conform_support/native
-      'target_name': 'egl_main_native',
-      'type': 'static_library',
-      'dependencies': [
-        'egl_native',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'sources': [
-        '<@(bootstrap_sources_native)',
-      ],
-      'defines': [
-        'GLES2_CONFORM_SUPPORT_ONLY',
-        'GTF_GLES20',
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-    },
-    {
-      # GN version: //gpu/gles2_conform_support/native:windowless
-      'target_name': 'egl_main_windowless',
-      'type': 'static_library',
-      'dependencies': [
-        'egl_native',
-        '../../third_party/khronos/khronos.gyp:khronos_headers',
-      ],
-      'sources': [
-        'native/egl_native.cc',
-        'native/egl_native_windowless.cc',
-        'native/main.cc',
-        '<@(bootstrap_sources_native)',
-      ],
-      'defines': [
-        'GLES2_CONFORM_SUPPORT_ONLY',
-        'GTF_GLES20',
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-    },
-    {
-      # GN version: //gpu/gles2_conform_support
-      'target_name': 'gles2_conform_support',
-      'type': 'executable',
-      'dependencies': [
-        'egl_native',
-        '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
-        '../../gpu/gpu.gyp:gles2_c_lib_nocheck',
-        '../../third_party/expat/expat.gyp:expat',
-      ],
-      'defines': [
-        'GLES2_CONFORM_SUPPORT_ONLY',
-        'GTF_GLES20',
-        'EGLAPI=',
-        'EGLAPIENTRY=',
-      ],
-      'sources': [
-        '<@(bootstrap_sources_native)',
-        'gles2_conform_support.c'
-      ],
-    },
-  ],
-}