Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2046)

Unified Diff: gpu/tools/tools.gyp

Issue 148643002: Hide X11 dependencies when use_x11=0. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Include compositor_model_bench for only x11 builds for now. (Right Version) Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | media/cast/cast.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: gpu/tools/tools.gyp
diff --git a/gpu/tools/tools.gyp b/gpu/tools/tools.gyp
index d34f628abccf0378071ff6465e72d005d1185bf4..7eb4b1ea5d80a1932faaa2de6938d5d0c596db72 100644
--- a/gpu/tools/tools.gyp
+++ b/gpu/tools/tools.gyp
@@ -9,16 +9,18 @@
'targets': [
],
'conditions': [
- ['OS == "linux" and target_arch != "arm"', {
+ ['OS == "linux" and target_arch != "arm" and use_x11==1', {
'targets': [
{
'target_name': 'compositor_model_bench',
'type': 'executable',
+
piman 2014/02/18 20:23:30 nit: avoid blank lines in gyp files.
'dependencies': [
'../../base/base.gyp:base',
'../../build/linux/system.gyp:x11',
'../../ui/gl/gl.gyp:gl',
],
+
'libraries': [
'-lGL',
'-ldl',
« no previous file with comments | « chrome/chrome_exe.gypi ('k') | media/cast/cast.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698