build/all.gyp - Issue 14554002: Get use_aura=1 and use_aura=1 use_ash=1 building on linux

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: build/all.gyp

Issue 14554002: Get use_aura=1 and use_aura=1 use_ash=1 building on linux (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: cleanup Created 7 years, 8 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: build/all.gyp

diff --git a/build/all.gyp b/build/all.gyp

index 85dc8a94e499241f6e6bc4cbae6257a49b9ea8f4..fe03d33c2ae8aa3722155c7f06b4ae63760ed842 100644

--- a/build/all.gyp

+++ b/build/all.gyp

@@ -158,11 +158,15 @@

}],

['use_aura==1', {

'dependencies': [

- '../ash/ash.gyp:*',

'../ui/aura/aura.gyp:*',

'../ui/oak/oak.gyp:*',

}],

+ ['use_ash==1', {

+ 'dependencies': [

+ '../ash/ash.gyp:*',

+ ],

+ }],

['remoting==1', {

'dependencies': [

'../remoting/remoting.gyp:*',