chrome/chrome_resources.gyp - Issue 10905242: add ash_resources.grd and necessary changes to use images in ash/resources

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 10905242: add ash_resources.grd and necessary changes to use images in ash/resources (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: don't guard ash_strings with aura=1 Created 8 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:

View side-by-side diff with in-line comments

Download patch

Index: chrome/chrome_resources.gyp

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

index 66f8a88f76fdcb4b3154e7f12a24c255782afd93..94075ef990fda9819bb46ade44ddf5ca6798403a 100644

--- a/chrome/chrome_resources.gyp

+++ b/chrome/chrome_resources.gyp

@@ -301,6 +301,11 @@

'conditions': [

+ ['use_aura==1', {

+ 'dependencies': [

+ '<(DEPTH)/ash/ash.gyp:ash_resources',

+ ],

+ }],

['OS != "mac"', {

# Copy pak files to the product directory. These files will be picked

# up by the following installer scripts:

« no previous file with comments | « chrome/chrome_repack_chrome_200_percent.gypi ('k') | chrome/chrome_tests.gypi » ('j') | no next file with comments »