Upgrading Mesa to 9.0.3

ui/gl/gl.gyp

 # 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,
   },
 
   'targets': [
     {
       'target_name': 'gl',
       'type': '<(component)',
       'product_name': 'gl_wrapper',  # Avoid colliding with OS X's libGL.dylib
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/gpu/command_buffer/command_buffer.gyp:gles2_utils',
         '<(DEPTH)/skia/skia.gyp:skia',
+        '<(DEPTH)/third_party/khronos/khronos.gyp:khronos_headers',

[Ken Russell (switch to Gerrit), 2013/06/18 22:29:41]

Please undo the changes to this file. They shouldn't be necessary any more, and
if they are, then we need to find a different solution.

[Myles C. Maxfield (Amazon.com), 2013/06/18 22:52:01]

They are necessary. I'll revert these and show you the relevant error, then we
can come up with a solution together.

On 2013/06/18 22:29:41, kbr wrote:

         '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
         '<(DEPTH)/ui/ui.gyp:ui',
       ],
       'variables': {
         'gl_binding_output_dir': '<(SHARED_INTERMEDIATE_DIR)/ui/gl',
       },
       'defines': [
         'GL_IMPLEMENTATION',
       ],
       'include_dirs': [
         '<(DEPTH)/third_party/swiftshader/include',
+        '<(DEPTH)/third_party/khronos',
         '<(DEPTH)/third_party/mesa/src/include',
         '<(gl_binding_output_dir)',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
           '<(gl_binding_output_dir)',
         ],
       },
       'export_dependent_settings': [
         '<(DEPTH)/third_party/mesa/mesa.gyp:mesa_headers',
@@ skipping 303 matching lines @@
           ],
           'variables': {
             'jni_gen_package': 'ui/gl',
           },
           'includes': [ '../../build/jni_generator.gypi' ],
         },
       ],
     }],
   ],
 }