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', |
+ ], |
+ }], |
+ ], |
+ }], |
], |
}, |
{ |