diff options
| author | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 17:51:19 +0000 |
|---|---|---|
| committer | davemoore@chromium.org <davemoore@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-04-29 17:51:19 +0000 |
| commit | 4d13a3593403ab890e4e9f51ede9b5104b56e4d8 (patch) | |
| tree | f533908254c6877b36cf3289f9fe945edc49079b /content/content_gpu.gypi | |
| parent | c9c94badff01963c313e77604ee838254e11240f (diff) | |
| download | chromium_src-4d13a3593403ab890e4e9f51ede9b5104b56e4d8.zip chromium_src-4d13a3593403ab890e4e9f51ede9b5104b56e4d8.tar.gz chromium_src-4d13a3593403ab890e4e9f51ede9b5104b56e4d8.tar.bz2 | |
Rationalize linux vs x11 in content
BUG=236170
TEST=None
R=ben@chromium.org
Review URL: https://codereview.chromium.org/14334018
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@197074 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'content/content_gpu.gypi')
| -rw-r--r-- | content/content_gpu.gypi | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/content/content_gpu.gypi b/content/content_gpu.gypi index ec4f552..9be835e 100644 --- a/content/content_gpu.gypi +++ b/content/content_gpu.gypi @@ -12,9 +12,9 @@ 'sources': [ 'gpu/gpu_dx_diagnostics_win.cc', 'gpu/gpu_info_collector_android.cc', - 'gpu/gpu_info_collector_linux.cc', 'gpu/gpu_info_collector_mac.mm', 'gpu/gpu_info_collector_win.cc', + 'gpu/gpu_info_collector_x11.cc', 'gpu/gpu_info_collector.cc', 'gpu/gpu_info_collector.h', 'gpu/gpu_main.cc', @@ -85,7 +85,7 @@ '../third_party/amd/amd_videocard_info_win.cc', ], }], - ['OS=="linux"', { + ['OS=="linux" and use_x11==1', { 'dependencies': [ '../build/linux/system.gyp:libpci', '../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl', |