gpu/gpu_config.gypi - Issue 862133002: Update from https://crrev.com/312398

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: gpu/gpu_config.gypi

Issue 862133002: Update from https://crrev.com/312398 (Closed) Base URL: git@github.com:domokit/mojo.git@master

Patch Set: Created 5 years, 11 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:

Index: gpu/gpu_config.gypi

diff --git a/gpu/gpu_config.gypi b/gpu/gpu_config.gypi

index a012b08532c9e141192bfd89ce669b24fccd462f..98b19aa4c6bbb3323d08754dbc0d46497506ffbc 100644

--- a/gpu/gpu_config.gypi

+++ b/gpu/gpu_config.gypi

@@ -31,6 +31,7 @@

'config/gpu_info_collector_linux.cc',

'config/gpu_info_collector_linux.h',

'config/gpu_info_collector_mac.mm',

+ 'config/gpu_info_collector_ozone.cc',

'config/gpu_info_collector_win.cc',

'config/gpu_info_collector_x11.cc',

'config/gpu_info_collector.cc',

@@ -64,7 +65,7 @@

'../third_party/amd/amd_videocard_info_win.cc',

}],

- ['OS=="linux" and use_libpci==1 and use_x11==1', {

+ ['OS=="linux" and use_libpci==1 and (use_x11==1 or use_ozone==1)', {

'dependencies': [

'../build/linux/system.gyp:libpci',

@@ -74,6 +75,7 @@

'../build/linux/system.gyp:x11',

'../build/linux/system.gyp:xext',

'../third_party/libXNVCtrl/libXNVCtrl.gyp:libXNVCtrl',

+ '../ui/gfx/x/gfx_x11.gyp:gfx_x11',

}],

« no previous file with comments | « gpu/gpu.gyp ('k') | gpu/gpu_unittests.isolate » ('j') | shell/BUILD.gn » ('J')