ui/gfx/compositor/compositor.gyp - Issue 8430011: Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation

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/gfx/compositor/compositor.gyp

Issue 8430011: Revert 107967 - Introduces chromium_resources.gyp to factor out Chrome resource generation (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/

Patch Set: Created 9 years, 2 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/gfx/compositor/compositor.gyp

===================================================================

--- ui/gfx/compositor/compositor.gyp (revision 107983)

+++ ui/gfx/compositor/compositor.gyp (working copy)

@@ -130,7 +130,6 @@

'dependencies': [

'<(DEPTH)/base/base.gyp:base',

'<(DEPTH)/base/base.gyp:test_support_base',

- '<(DEPTH)/chrome/chrome_resources.gyp:packed_resources',

'<(DEPTH)/skia/skia.gyp:skia',

'<(DEPTH)/testing/gtest.gyp:gtest',

'<(DEPTH)/ui/gfx/gl/gl.gyp:gl',

@@ -164,6 +163,11 @@

'<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',

}],

+ ['OS!="mac"', {

+ 'dependencies': [

+ '<(DEPTH)/chrome/chrome.gyp:packed_resources',

+ ],

+ }],

{

« no previous file with comments | « ui/aura_shell/aura_shell.gyp ('k') | views/views.gyp » ('j') | no next file with comments »