| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 | 6 |
| 7 component("compositor") { | 7 component("compositor") { |
| 8 sources = [ | 8 sources = [ |
| 9 "compositor.cc", | 9 "compositor.cc", |
| 10 "compositor.h", | 10 "compositor.h", |
| (...skipping 96 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 107 #"//third_party/WebKit/public:blink_minimal", TODO(GYP) | 107 #"//third_party/WebKit/public:blink_minimal", TODO(GYP) |
| 108 "//ui/base", | 108 "//ui/base", |
| 109 "//ui/gfx", | 109 "//ui/gfx", |
| 110 "//ui/gfx/geometry", | 110 "//ui/gfx/geometry", |
| 111 "//ui/gl", | 111 "//ui/gl", |
| 112 #'<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', TODO(GYP) | 112 #'<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', TODO(GYP) |
| 113 ] | 113 ] |
| 114 | 114 |
| 115 if (use_x11) { | 115 if (use_x11) { |
| 116 configs += [ "//build/config/linux:x11" ] | 116 configs += [ "//build/config/linux:x11" ] |
| 117 deps += [ "//ui/gfx:gfx_x11" ] | 117 deps += [ "//ui/gfx/x" ] |
| 118 } | 118 } |
| 119 } | 119 } |
| 120 | 120 |
| 121 # TODO(GYP) enable this when all dependencies are complete and it links. | 121 # TODO(GYP) enable this when all dependencies are complete and it links. |
| 122 #test("compositor_unittests") { | 122 #test("compositor_unittests") { |
| 123 # sources = [ | 123 # sources = [ |
| 124 # "layer_animation_element_unittest.cc", | 124 # "layer_animation_element_unittest.cc", |
| 125 # "layer_animation_sequence_unittest.cc", | 125 # "layer_animation_sequence_unittest.cc", |
| 126 # "layer_animator_unittest.cc", | 126 # "layer_animator_unittest.cc", |
| 127 # "layer_owner_unittest.cc", | 127 # "layer_owner_unittest.cc", |
| (...skipping 16 matching lines...) Expand all Loading... |
| 144 # "//ui/gfx", | 144 # "//ui/gfx", |
| 145 # "//ui/gfx/geometry", | 145 # "//ui/gfx/geometry", |
| 146 # "//ui/gl", | 146 # "//ui/gl", |
| 147 # "//ui/resources", | 147 # "//ui/resources", |
| 148 # ] | 148 # ] |
| 149 # | 149 # |
| 150 # if (is_linux) { | 150 # if (is_linux) { |
| 151 # #deps += [ "//third_party/mesa:osmesa" ] # TODO(GYP) | 151 # #deps += [ "//third_party/mesa:osmesa" ] # TODO(GYP) |
| 152 # } | 152 # } |
| 153 #} | 153 #} |
| OLD | NEW |