diff options
| author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:03:35 +0000 |
|---|---|---|
| committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-11-16 07:03:35 +0000 |
| commit | 6637a92faaa89b333fff64063551d19f64322a9b (patch) | |
| tree | 169c25aae6da0e7a841352ff118d8d376edf65e1 /ui | |
| parent | f363d90e4cea728058107ad86d9de1ebffbd9182 (diff) | |
| download | chromium_src-6637a92faaa89b333fff64063551d19f64322a9b.zip chromium_src-6637a92faaa89b333fff64063551d19f64322a9b.tar.gz chromium_src-6637a92faaa89b333fff64063551d19f64322a9b.tar.bz2 | |
Encapsulate mesa include paths in mesa.gyp,
instead of "hardcoding" it in gl.gyp. This is one of steps
towards use_system_mesa build option.
BUG=161389
Review URL: https://chromiumcodereview.appspot.com/11308060
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@168144 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/gl/gl.gyp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp index e330a15..3347fba 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/mesa/mesa.gyp:headers', '<(DEPTH)/ui/ui.gyp:ui', ], 'variables': { @@ -32,10 +33,12 @@ ], 'direct_dependent_settings': { 'include_dirs': [ - '<(DEPTH)/third_party/mesa/MesaLib/include', '<(gl_binding_output_dir)', ], }, + 'export_dependent_settings': [ + '<(DEPTH)/third_party/mesa/mesa.gyp:headers', + ], 'sources': [ 'gl_bindings.h', 'gl_bindings_skia_in_process.cc', |