diff options
author | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 17:01:55 +0000 |
---|---|---|
committer | backer@chromium.org <backer@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-06-25 17:01:55 +0000 |
commit | ae80234930dff518134b0073fe7c3d3fdcdcd4ec (patch) | |
tree | 5b267918fac3d3b414ab5a6d1a62f137e45bf4cc /gpu/gpu.gyp | |
parent | 1cf99aa4097c941fbd3295eee277b40a947978df (diff) | |
download | chromium_src-ae80234930dff518134b0073fe7c3d3fdcdcd4ec.zip chromium_src-ae80234930dff518134b0073fe7c3d3fdcdcd4ec.tar.gz chromium_src-ae80234930dff518134b0073fe7c3d3fdcdcd4ec.tar.bz2 |
Reland "EGLImage transport for TOUCH_UI".
The issue with r90511 was that we need EGL header files for touchui=1 builds. The solution was to pull them in from third_party/angle for touchui=1 only.
BUG=none
TEST=by hand on Linux (w/ and w/o TOUCH_UI), Windows, and Mac
TBR=sky@chromium.org,apatrick@chromium.org
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@90513 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'gpu/gpu.gyp')
-rw-r--r-- | gpu/gpu.gyp | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/gpu/gpu.gyp b/gpu/gpu.gyp index 6ca8ee2..6e4a2c3a0 100644 --- a/gpu/gpu.gyp +++ b/gpu/gpu.gyp @@ -239,6 +239,11 @@ '../build/linux/system.gyp:gtk', ], }], + ['touchui==1', { + 'include_dirs': [ + '<(DEPTH)/third_party/angle/include', + ], + }], ], }, { |