chrome/chrome_resources.gyp - Issue 514293003: Run athena on chrome

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: chrome/chrome_resources.gyp

Issue 514293003: Run athena on chrome (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: addressed comments, rebase Created 6 years, 3 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: chrome/chrome_resources.gyp

diff --git a/chrome/chrome_resources.gyp b/chrome/chrome_resources.gyp

index a27d9202ae1d5130e634c29d5879c424f0ecd13b..5412b09657cc69c800168a2384d769544a576b6d 100644

--- a/chrome/chrome_resources.gyp

+++ b/chrome/chrome_resources.gyp

@@ -461,6 +461,11 @@

'<(DEPTH)/ui/chromeos/ui_chromeos.gyp:ui_chromeos_strings',

}],

+ ['use_athena==1', {

+ 'dependencies': [

+ '<(DEPTH)/athena/resources/athena_resources.gyp:athena_resources',

+ ],

+ }],

['enable_autofill_dialog==1 and OS!="android"', {

'dependencies': [

'<(DEPTH)/third_party/libaddressinput/libaddressinput.gyp:libaddressinput_strings',