summaryrefslogtreecommitdiffstats
path: root/gpu/command_buffer/command_buffer.gyp
diff options
context:
space:
mode:
authorbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 10:33:46 +0000
committerbauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2012-11-28 10:33:46 +0000
commit7d51a725ae8963b801e460d8ac783079c6c0e5e3 (patch)
tree67587195e12192ec29e60939d93c956f8678b156 /gpu/command_buffer/command_buffer.gyp
parent7dc1ffbd5b5027f683b616a4c605f6c8c07e6fe4 (diff)
downloadchromium_src-7d51a725ae8963b801e460d8ac783079c6c0e5e3.zip
chromium_src-7d51a725ae8963b801e460d8ac783079c6c0e5e3.tar.gz
chromium_src-7d51a725ae8963b801e460d8ac783079c6c0e5e3.tar.bz2
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
Diffstat (limited to 'gpu/command_buffer/command_buffer.gyp')
-rw-r--r--gpu/command_buffer/command_buffer.gyp2
1 files changed, 1 insertions, 1 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',