Disambiguate 'headers' targets in khronos and mesa.

I suspect that the target name collision is causing compile failures on Win (e.g. http://build.chromium.org/p/chromium.win/builders/Win%20Builder/builds/4176/steps/compile/logs/stdio)

BUG=none
TBR=jochen@chromium.org
NOTRY=true

Review URL: https://codereview.chromium.org/11412217

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@169895 0039d316-1c4b-4281-b951-d872f2087c98

9 files changed, 14 insertions, 14 deletions

diff --git a/gpu/command_buffer/command_buffer.gyp b/gpu/command_buffer/command_buffer.gyp
index 382cd51..8ffd15b 100644
--- a/gpu/command_buffer/command_buffer.gyp
+++ b/gpu/command_buffer/command_buffer.gyp
@@ -18,7 +18,7 @@
       },
       'dependencies': [
         '../../base/base.gyp:base',
-        '../../third_party/khronos/khronos.gyp:headers',
+        '../../third_party/khronos/khronos.gyp:khronos_headers',
       ],
       'export_dependent_settings': [
         '../../base/base.gyp:base',
diff --git a/gpu/command_buffer/command_buffer_untrusted.gyp b/gpu/command_buffer/command_buffer_untrusted.gyp
index f9da966..5fe47f3 100644
--- a/gpu/command_buffer/command_buffer_untrusted.gyp
+++ b/gpu/command_buffer/command_buffer_untrusted.gyp
@@ -26,7 +26,7 @@
           'dependencies': [
             '../../native_client/tools.gyp:prep_toolchain',
             '../../base/base_untrusted.gyp:base_untrusted',
-            '../../third_party/khronos/khronos.gyp:headers',
+            '../../third_party/khronos/khronos.gyp:khronos_headers',
           ],
         },
       ],
diff --git a/gpu/command_buffer_client.gypi b/gpu/command_buffer_client.gypi
index f3d379f..b4d5b78 100644
--- a/gpu/command_buffer_client.gypi
+++ b/gpu/command_buffer_client.gypi
@@ -12,7 +12,7 @@
     ],
   },
   'dependencies': [
-    '../third_party/khronos/khronos.gyp:headers',
+    '../third_party/khronos/khronos.gyp:khronos_headers',
   ],
   'sources': [
     'command_buffer/client/atomicops.cc',
diff --git a/gpu/command_buffer_common.gypi b/gpu/command_buffer_common.gypi
index 3134a2a..5b71ef9 100644
--- a/gpu/command_buffer_common.gypi
+++ b/gpu/command_buffer_common.gypi
@@ -4,7 +4,7 @@
 
 {
   'dependencies': [
-    '../third_party/khronos/khronos.gyp:headers',
+    '../third_party/khronos/khronos.gyp:khronos_headers',
   ],
   'sources': [
     'command_buffer/common/bitfield_helpers.h',
diff --git a/gpu/command_buffer_service.gypi b/gpu/command_buffer_service.gypi
index 57fde5b..db62cdd 100644
--- a/gpu/command_buffer_service.gypi
+++ b/gpu/command_buffer_service.gypi
@@ -19,7 +19,7 @@
     '../ui/surface/surface.gyp:surface',
     '../ui/ui.gyp:ui',
     '../third_party/angle/src/build_angle.gyp:translator_glsl',
-    '../third_party/khronos/khronos.gyp:headers',
+    '../third_party/khronos/khronos.gyp:khronos_headers',
     '../third_party/smhasher/smhasher.gyp:cityhash',
   ],
   'sources': [
diff --git a/gpu/gles2_conform_support/gles2_conform_support.gyp b/gpu/gles2_conform_support/gles2_conform_support.gyp
index ae4683a..bfc5949 100644
--- a/gpu/gles2_conform_support/gles2_conform_support.gyp
+++ b/gpu/gles2_conform_support/gles2_conform_support.gyp
@@ -34,7 +34,7 @@
         '../../gpu/gpu.gyp:gpu',
         '../../gpu/gpu.gyp:gles2_implementation_client_side_arrays_no_check',
         '../../gpu/gpu.gyp:command_buffer_service',
-        '../../third_party/khronos/khronos.gyp:headers',
+        '../../third_party/khronos/khronos.gyp:khronos_headers',
         '../../ui/gl/gl.gyp:gl',
         '../../ui/ui.gyp:ui',
       ],
@@ -57,7 +57,7 @@
       'type': 'static_library',
       'dependencies': [
         'egl_native',
-        '../../third_party/khronos/khronos.gyp:headers',
+        '../../third_party/khronos/khronos.gyp:khronos_headers',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
@@ -79,7 +79,7 @@
       'type': 'static_library',
       'dependencies': [
         'egl_native',
-        '../../third_party/khronos/khronos.gyp:headers',
+        '../../third_party/khronos/khronos.gyp:khronos_headers',
       ],
       'conditions': [
         ['toolkit_uses_gtk == 1', {
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp
index 5e13164c0..258886c 100644
--- a/gpu/gpu.gyp
+++ b/gpu/gpu.gyp
@@ -16,7 +16,7 @@
       'type': '<(component)',
       'dependencies': [
         '../base/base.gyp:base',
-        '../third_party/khronos/khronos.gyp:headers',
+        '../third_party/khronos/khronos.gyp:khronos_headers',
         '../ui/gl/gl.gyp:gl',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
@@ -38,7 +38,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../third_party/khronos/khronos.gyp:headers',
+        '../third_party/khronos/khronos.gyp:khronos_headers',
         '../ui/gl/gl.gyp:gl',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
@@ -58,7 +58,7 @@
       ],
       'dependencies': [
         '../base/base.gyp:base',
-        '../third_party/khronos/khronos.gyp:headers',
+        '../third_party/khronos/khronos.gyp:khronos_headers',
         'command_buffer/command_buffer.gyp:gles2_utils',
         'gles2_cmd_helper',
       ],
@@ -255,7 +255,7 @@
       'dependencies': [
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
-        '../third_party/khronos/khronos.gyp:headers',
+        '../third_party/khronos/khronos.gyp:khronos_headers',
         '../ui/gl/gl.gyp:gl',
       ],
       'include_dirs': [
diff --git a/gpu/gpu_ipc.gypi b/gpu/gpu_ipc.gypi
index de287ab..2777e96 100644
--- a/gpu/gpu_ipc.gypi
+++ b/gpu/gpu_ipc.gypi
@@ -5,7 +5,7 @@
 {
   'dependencies': [
     '../ipc/ipc.gyp:ipc',
-    '../third_party/khronos/khronos.gyp:headers',
+    '../third_party/khronos/khronos.gyp:khronos_headers',
   ],
   'include_dirs': [
     '..',
diff --git a/gpu/gpu_untrusted.gyp b/gpu/gpu_untrusted.gyp
index 1f92721..a6e502f 100644
--- a/gpu/gpu_untrusted.gyp
+++ b/gpu/gpu_untrusted.gyp
@@ -33,7 +33,7 @@
           'dependencies': [
             '../native_client/tools.gyp:prep_toolchain',
             '../base/base_untrusted.gyp:base_untrusted',
-            '../third_party/khronos/khronos.gyp:headers',
+            '../third_party/khronos/khronos.gyp:khronos_headers',
             'command_buffer/command_buffer_untrusted.gyp:gles2_utils_untrusted',
             'gles2_cmd_helper_untrusted',
           ],