| Index: ui/compositor/BUILD.gn
|
| diff --git a/ui/compositor/BUILD.gn b/ui/compositor/BUILD.gn
|
| index f85e7732878a3d1e416965e5c084bbb9e8b325e9..04a7addabaae98b72ed6e434cb893e710ef5b7b6 100644
|
| --- a/ui/compositor/BUILD.gn
|
| +++ b/ui/compositor/BUILD.gn
|
| @@ -78,65 +78,62 @@ component("compositor") {
|
| }
|
|
|
| if (false) {
|
| + source_set("test_support") {
|
| + testonly = true
|
| + sources = [
|
| + "test/context_factories_for_test.cc",
|
| + "test/context_factories_for_test.h",
|
| + "test/draw_waiter_for_test.cc",
|
| + "test/draw_waiter_for_test.h",
|
| + "test/in_process_context_factory.cc",
|
| + "test/in_process_context_factory.h",
|
| + "test/layer_animator_test_controller.cc",
|
| + "test/layer_animator_test_controller.h",
|
| + "test/test_compositor_host.h",
|
| + "test/test_compositor_host_mac.mm",
|
| + "test/test_compositor_host_win.cc",
|
| + "test/test_layer_animation_delegate.cc",
|
| + "test/test_layer_animation_delegate.h",
|
| + "test/test_layer_animation_observer.cc",
|
| + "test/test_layer_animation_observer.h",
|
| + "test/test_layers.cc",
|
| + "test/test_layers.h",
|
| + "test/test_suite.cc",
|
| + "test/test_suite.h",
|
| + "test/test_utils.cc",
|
| + "test/test_utils.h",
|
| + ]
|
|
|
| -source_set("test_support") {
|
| - testonly = true
|
| - sources = [
|
| - "test/context_factories_for_test.cc",
|
| - "test/context_factories_for_test.h",
|
| - "test/draw_waiter_for_test.cc",
|
| - "test/draw_waiter_for_test.h",
|
| - "test/in_process_context_factory.cc",
|
| - "test/in_process_context_factory.h",
|
| - "test/layer_animator_test_controller.cc",
|
| - "test/layer_animator_test_controller.h",
|
| - "test/test_compositor_host.h",
|
| - "test/test_compositor_host_mac.mm",
|
| - "test/test_compositor_host_win.cc",
|
| - "test/test_layer_animation_delegate.cc",
|
| - "test/test_layer_animation_delegate.h",
|
| - "test/test_layer_animation_observer.cc",
|
| - "test/test_layer_animation_observer.h",
|
| - "test/test_layers.cc",
|
| - "test/test_layers.h",
|
| - "test/test_suite.cc",
|
| - "test/test_suite.h",
|
| - "test/test_utils.cc",
|
| - "test/test_utils.h",
|
| - ]
|
| -
|
| - public_deps = [
|
| - ":compositor",
|
| - ]
|
| - deps = [
|
| - "//base/test:test_support",
|
| - "//cc",
|
| - "//cc/surfaces",
|
| - "//cc:test_support",
|
| - "//skia",
|
| - "//testing/gtest",
|
| - "//third_party/WebKit/public:blink_minimal",
|
| - "//ui/base",
|
| - "//ui/gfx",
|
| - "//ui/gfx/geometry",
|
| - "//ui/gl",
|
| - "//webkit/common/gpu",
|
| - ]
|
| + public_deps = [
|
| + ":compositor",
|
| + ]
|
| + deps = [
|
| + "//base/test:test_support",
|
| + "//cc",
|
| + "//cc/surfaces",
|
| + "//cc:test_support",
|
| + "//skia",
|
| + "//testing/gtest",
|
| + "//third_party/WebKit/public:blink_minimal",
|
| + "//ui/base",
|
| + "//ui/gfx",
|
| + "//ui/gfx/geometry",
|
| + "//ui/gl",
|
| + "//webkit/common/gpu",
|
| + ]
|
|
|
| - if (use_x11) {
|
| - configs += [ "//build/config/linux:x11" ]
|
| - deps += [ "//ui/gfx/x" ]
|
| - }
|
| + if (use_x11) {
|
| + configs += [ "//build/config/linux:x11" ]
|
| + deps += [ "//ui/gfx/x" ]
|
| + }
|
|
|
| - if (use_ozone) {
|
| - sources += [ "test/test_compositor_host_ozone.cc" ]
|
| - } else if (use_x11) {
|
| - sources += [ "test/test_compositor_host_x11.cc" ]
|
| + if (use_ozone) {
|
| + sources += [ "test/test_compositor_host_ozone.cc" ]
|
| + } else if (use_x11) {
|
| + sources += [ "test/test_compositor_host_x11.cc" ]
|
| + }
|
| }
|
| -}
|
| -
|
| } # if (false)
|
| -
|
| # TODO(GYP) enable this when all dependencies are complete and it links.
|
| #test("compositor_unittests") {
|
| # sources = [
|
|
|