Upgrading Mesa to 9.0.3

ui/gl/gl.gyp

Index: ui/gl/gl.gyp
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 115b373518119a9ce16096560f4fb1cfe7a490b4..fdd1400ae9b7b002aa8562b4cbe24ce96f53caf8 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -17,6 +17,7 @@
         '<(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',
       ],
@@ -28,6 +29,7 @@
       ],
       'include_dirs': [
         '<(DEPTH)/third_party/swiftshader/include',
+        '<(DEPTH)/third_party/khronos',
         '<(DEPTH)/third_party/mesa/src/include',
         '<(gl_binding_output_dir)',
       ],