Revert 111170 - Move GL headers from gpu to third_party/khronos

gpu/gpu.gyp

 # Copyright (c) 2011 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 need to build this library twice. Once
     # with extra parameter checking. Once with no parameter checking to be 100%
     # OpenGL ES 2.0 compliant for the conformance tests.
@@ skipping 12 matching lines @@
       'command_buffer/client/gles2_implementation.h',
       'command_buffer/client/program_info_manager.cc',
       'command_buffer/client/program_info_manager.h',
     ]
   },
   'targets': [
     {
       'target_name': 'command_buffer_common',
       'type': 'static_library',
       'include_dirs': [
-        '<(DEPTH)/third_party/khronos',
+        '.',
       ],
       'all_dependent_settings': {
         'include_dirs': [
-          '<(DEPTH)/third_party/khronos',
+          '.',
         ],
       },
       'dependencies': [
         '../base/base.gyp:base',
       ],
       'export_dependent_settings': [
         '../base/base.gyp:base',
       ],
       'sources': [
         'command_buffer/common/bitfield_helpers.h',
@@ skipping 35 matching lines @@
       'target_name': 'gles2_implementation',
       'type': 'static_library',
       'dependencies': [
         '../base/base.gyp:base',
         '../ui/gfx/gl/gl.gyp:gl',
         'gles2_cmd_helper',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           # For GLES2/gl2.h
-          '<(DEPTH)/third_party/khronos',
+          '.',
         ],
       },
       'sources': [
         '<@(gles2_implementation_source_files)',
       ],
     },
     {
       # Library emulates GLES2 using command_buffers.
       'target_name': 'gles2_implementation_client_side_arrays',
       'type': 'static_library',
       'defines': [
         'GLES2_SUPPORT_CLIENT_SIDE_ARRAYS=1',
         'GLES2_CONFORMANCE_TESTS=1',
       ],
       'dependencies': [
         '../base/base.gyp:base',
         'gles2_cmd_helper',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           # For GLES2/gl2.h
-          '<(DEPTH)/third_party/khronos',
+          '.',
         ],
       },
       'sources': [
         '<@(gles2_implementation_source_files)',
       ],
     },
     {
       # Stub to expose gles2_implemenation in C instead of C++.
       # so GLES2 C programs can work with no changes.
       'target_name': 'gles2_c_lib',
@@ skipping 19 matching lines @@
       ],
       'sources': [
         '<@(gles2_c_lib_source_files)',
       ],
     },
     {
       'target_name': 'command_buffer_client',
       'type': 'static_library',
       'include_dirs': [
         '..',
-        '<(DEPTH)/third_party/khronos',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '..',
-          '<(DEPTH)/third_party/khronos',
         ],
       },
       'dependencies': [
         'command_buffer_common',
       ],
       'sources': [
         'command_buffer/client/cmd_buffer_helper.cc',
         'command_buffer/client/cmd_buffer_helper.h',
         'command_buffer/client/fenced_allocator.cc',
         'command_buffer/client/fenced_allocator.h',
         'command_buffer/client/mapped_memory.cc',
         'command_buffer/client/mapped_memory.h',
         'command_buffer/client/ring_buffer.cc',
         'command_buffer/client/ring_buffer.h',
       ],
     },
     {
       'target_name': 'command_buffer_service',
       'type': 'static_library',
       'include_dirs': [
         '..',
-        '<(DEPTH)/third_party/khronos',
       ],
       'all_dependent_settings': {
         'include_dirs': [
           '..',
-          '<(DEPTH)/third_party/khronos',
         ],
       },
       'dependencies': [
         'command_buffer_common',
         '../base/base.gyp:base',
         '../ui/gfx/gl/gl.gyp:gl',
         '../ui/gfx/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui',
         '../third_party/angle/src/build_angle.gyp:translator_glsl',
       ],
@@ skipping 126 matching lines @@
     {
       'target_name': 'gpu_unittest_utils',
       'type': 'static_library',
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/gfx/gl/gl.gyp:gl',
       ],
       'include_dirs': [
         '..',
-        '<(DEPTH)/third_party/khronos',
       ],
       'sources': [
         'command_buffer/common/gl_mock.h',
         'command_buffer/common/gl_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
         'command_buffer/service/gles2_cmd_decoder_mock.cc',
       ],
     },
     {
       'target_name': 'gpu_ipc',
       'type': 'static_library',
       'dependencies': [
         'command_buffer_client',
         'gles2_c_lib',
         '../base/base.gyp:base',
       ],
       'include_dirs': [
         '..',
-        '<(DEPTH)/third_party/khronos',
       ],
       'sources': [
         'ipc/gpu_command_buffer_traits.cc',
         'ipc/gpu_command_buffer_traits.h',
       ],
     },
   ],
 }