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

Unified Diff: ui/compositor/compositor.gyp

Issue 14744016: Remove unnecessary ui::CompositorTestSupport (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Add compositor_test_support dependency to ui/snapshot and ui/views test targets Created 7 years, 7 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
« no previous file with comments | « ui/aura/test/test_suite.cc ('k') | ui/compositor/test/compositor_test_support.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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',
+ ],
+ }],
+ ],
+ }],
],
},
],
« no previous file with comments | « ui/aura/test/test_suite.cc ('k') | ui/compositor/test/compositor_test_support.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698