diff options
| author | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 10:33:46 +0000 |
|---|---|---|
| committer | bauerb@chromium.org <bauerb@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-28 10:33:46 +0000 |
| commit | 7d51a725ae8963b801e460d8ac783079c6c0e5e3 (patch) | |
| tree | 67587195e12192ec29e60939d93c956f8678b156 /gpu/gpu_ipc.gypi | |
| parent | 7dc1ffbd5b5027f683b616a4c605f6c8c07e6fe4 (diff) | |
| download | chromium_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/gpu_ipc.gypi')
| -rw-r--r-- | gpu/gpu_ipc.gypi | 2 |
1 files changed, 1 insertions, 1 deletions
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': [ '..', |