| Index: ui/compositor/compositor.gyp
|
| diff --git a/ui/compositor/compositor.gyp b/ui/compositor/compositor.gyp
|
| index 226b2c49a698ca671a05fa26bd89d995c82670d6..d6c48a7cf2d51e6003d5b1140af1d839cc16078d 100644
|
| --- a/ui/compositor/compositor.gyp
|
| +++ b/ui/compositor/compositor.gyp
|
| @@ -79,28 +79,17 @@
|
| 'type': 'static_library',
|
| 'dependencies': [
|
| '<(DEPTH)/base/base.gyp:base',
|
| - '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_support',
|
| - '<(DEPTH)/third_party/WebKit/Source/WebKit/chromium/WebKit.gyp:webkit',
|
| + '<(DEPTH)/skia/skia.gyp:skia',
|
| + '<(DEPTH)/ui/gl/gl.gyp:gl',
|
| + '<(DEPTH)/ui/ui.gyp:ui',
|
| + 'compositor',
|
| ],
|
| 'sources': [
|
| - 'test/compositor_test_support.cc',
|
| - 'test/compositor_test_support.h',
|
| 'test/test_layers.cc',
|
| 'test/test_layers.h',
|
| 'test/test_suite.cc',
|
| 'test/test_suite.h',
|
| ],
|
| - 'conditions': [
|
| - ['os_posix == 1 and OS != "mac"', {
|
| - 'conditions': [
|
| - ['linux_use_tcmalloc==1', {
|
| - 'dependencies': [
|
| - '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| - ],
|
| - }],
|
| - ],
|
| - }],
|
| - ],
|
| },
|
| {
|
| 'target_name': 'compositor_unittests',
|
| @@ -144,6 +133,15 @@
|
| '<(DEPTH)/third_party/mesa/mesa.gyp:osmesa',
|
| ],
|
| }],
|
| + ['os_posix == 1 and OS != "mac"', {
|
| + 'conditions': [
|
| + ['linux_use_tcmalloc==1', {
|
| + 'dependencies': [
|
| + '<(DEPTH)/base/allocator/allocator.gyp:allocator',
|
| + ],
|
| + }],
|
| + ],
|
| + }],
|
| ],
|
| },
|
| ],
|
|
|