ui/views/views.gyp - Issue 1014663002: Buildfix for Ozone Linux build: guard build/linux/system.gyp:atk dep.

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: ui/views/views.gyp

Issue 1014663002: Buildfix for Ozone Linux build: guard build/linux/system.gyp:atk dep. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: separate out atk dependency Created 5 years, 9 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

Index: ui/views/views.gyp

diff --git a/ui/views/views.gyp b/ui/views/views.gyp

index e73f3617ad6b00c3bd15bc0dc9fbfdc8be029c2d..f5cecab7266511a851a5bd9f1d4a1b9a32924b18 100644

--- a/ui/views/views.gyp

+++ b/ui/views/views.gyp

@@ -635,9 +635,13 @@

'../display/display.gyp:display_util',

}],

- ['OS=="linux" and chromeos==0', {

+ ['OS=="linux" and chromeos==0 and use_ozone==0', {

'dependencies': [

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

+ ],

+ }],

+ ['OS=="linux" and chromeos==0', {

+ 'dependencies': [

'../shell_dialogs/shell_dialogs.gyp:shell_dialogs',

'sources!': [

« no previous file with comments | « no previous file | no next file » | no next file with comments »