summaryrefslogtreecommitdiffstats
path: root/ui/gl
diff options
context:
space:
mode:
authorsadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-12 17:31:44 +0000
committersadrul@chromium.org <sadrul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-05-12 17:31:44 +0000
commit9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb (patch)
tree41336d2f71061216d585ac233bff2e75080f80d7 /ui/gl
parentd738857a73566e03820bfc3c826585f62db378c9 (diff)
downloadchromium_src-9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb.zip
chromium_src-9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb.tar.gz
chromium_src-9e7a916001ca82d2b4fcfb8380efa66a4f9e97fb.tar.bz2
x11: Split the gfx_x11 target into its own gyp file.
Add a gfx_x11.gyp in //ui/gfx/x/ and define the gfx_x11 target in there, instead of defining it conditionally in //ui/gfx/gfx.gyp. This allows including this code from particular components even when X11 is turned off. BUG=361137 R=piman@chromium.org, sky@chromium.org Review URL: https://codereview.chromium.org/275273002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@269804 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ui/gl')
-rw-r--r--ui/gl/gl.gyp2
1 files changed, 1 insertions, 1 deletions
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 219f2a7..6a9bf13 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -222,7 +222,7 @@
'<(DEPTH)/build/linux/system.gyp:x11',
'<(DEPTH)/build/linux/system.gyp:xcomposite',
'<(DEPTH)/build/linux/system.gyp:xext',
- '<(DEPTH)/ui/gfx/gfx.gyp:gfx_x11',
+ '<(DEPTH)/ui/gfx/x/gfx_x11.gyp:gfx_x11',
],
}],
['OS=="win"', {