Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(236)

Unified Diff: ui/gfx/compositor/compositor.gyp

Issue 8591029: allocator.gyp target needs to be conditionally included in compositor.gyp (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 1 month 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
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: ui/gfx/compositor/compositor.gyp
diff --git a/ui/gfx/compositor/compositor.gyp b/ui/gfx/compositor/compositor.gyp
index ed0b04454bbc494d5d315b73860b384f328c25e6..423dfda33dec0a71be8f98ac078576952fe05e17 100644
--- a/ui/gfx/compositor/compositor.gyp
+++ b/ui/gfx/compositor/compositor.gyp
@@ -120,11 +120,19 @@
'conditions': [
['use_webkit_compositor == 1', {
'dependencies': [
oshima 2011/11/17 22:22:31 can you fix indent here?
dhollowa 2011/11/17 22:28:23 Done.
- '<(DEPTH)/base/allocator/allocator.gyp:allocator',
'<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
'<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
],
}],
+ ['os_posix == 1 and OS != "mac"', {
oshima 2011/11/17 22:22:31 It's a bit strange to be nested (could have just b
dhollowa 2011/11/17 22:28:23 Yes. I followed the pattern.
+ 'conditions': [
+ ['linux_use_tcmalloc==1', {
+ 'dependencies': [
+ '<(DEPTH)/base/allocator/allocator.gyp:allocator',
+ ],
+ }],
+ ],
+ }],
],
},
{
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698