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

Side by Side Diff: trunk/src/ui/compositor/compositor.gyp

Issue 25161002: Revert 225857 "gfx: Create a separate gfx component out of ui." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « trunk/src/ui/aura/aura.gyp ('k') | trunk/src/ui/gfx/android/gfx_jni_registrar.h » ('j') | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'compositor', 11 'target_name': 'compositor',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '<(DEPTH)/base/base.gyp:base', 14 '<(DEPTH)/base/base.gyp:base',
15 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations', 15 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
16 '<(DEPTH)/cc/cc.gyp:cc', 16 '<(DEPTH)/cc/cc.gyp:cc',
17 '<(DEPTH)/skia/skia.gyp:skia', 17 '<(DEPTH)/skia/skia.gyp:skia',
18 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal', 18 '<(DEPTH)/third_party/WebKit/public/blink.gyp:blink_minimal',
19 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
20 '<(DEPTH)/ui/gl/gl.gyp:gl', 19 '<(DEPTH)/ui/gl/gl.gyp:gl',
21 '<(DEPTH)/ui/ui.gyp:ui', 20 '<(DEPTH)/ui/ui.gyp:ui',
22 '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu', 21 '<(DEPTH)/webkit/common/gpu/webkit_gpu.gyp:webkit_gpu',
23 ], 22 ],
24 'defines': [ 23 'defines': [
25 'COMPOSITOR_IMPLEMENTATION', 24 'COMPOSITOR_IMPLEMENTATION',
26 ], 25 ],
27 'sources': [ 26 'sources': [
28 'compositor.cc', 27 'compositor.cc',
29 'compositor.h', 28 'compositor.h',
(...skipping 41 matching lines...) Expand 10 before | Expand all | Expand 10 after
71 ], 70 ],
72 }], 71 }],
73 ], 72 ],
74 }, 73 },
75 { 74 {
76 'target_name': 'compositor_test_support', 75 'target_name': 'compositor_test_support',
77 'type': 'static_library', 76 'type': 'static_library',
78 'dependencies': [ 77 'dependencies': [
79 '<(DEPTH)/base/base.gyp:base', 78 '<(DEPTH)/base/base.gyp:base',
80 '<(DEPTH)/skia/skia.gyp:skia', 79 '<(DEPTH)/skia/skia.gyp:skia',
81 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
82 '<(DEPTH)/ui/gl/gl.gyp:gl', 80 '<(DEPTH)/ui/gl/gl.gyp:gl',
83 '<(DEPTH)/ui/ui.gyp:ui', 81 '<(DEPTH)/ui/ui.gyp:ui',
84 'compositor', 82 'compositor',
85 ], 83 ],
86 'sources': [ 84 'sources': [
87 'test/test_layers.cc', 85 'test/test_layers.cc',
88 'test/test_layers.h', 86 'test/test_layers.h',
89 'test/test_suite.cc', 87 'test/test_suite.cc',
90 'test/test_suite.h', 88 'test/test_suite.h',
91 ], 89 ],
92 }, 90 },
93 { 91 {
94 'target_name': 'compositor_unittests', 92 'target_name': 'compositor_unittests',
95 'type': 'executable', 93 'type': 'executable',
96 'dependencies': [ 94 'dependencies': [
97 '<(DEPTH)/base/base.gyp:base', 95 '<(DEPTH)/base/base.gyp:base',
98 '<(DEPTH)/base/base.gyp:test_support_base', 96 '<(DEPTH)/base/base.gyp:test_support_base',
99 '<(DEPTH)/cc/cc.gyp:cc', 97 '<(DEPTH)/cc/cc.gyp:cc',
100 '<(DEPTH)/cc/cc_tests.gyp:cc_test_utils', 98 '<(DEPTH)/cc/cc_tests.gyp:cc_test_utils',
101 '<(DEPTH)/skia/skia.gyp:skia', 99 '<(DEPTH)/skia/skia.gyp:skia',
102 '<(DEPTH)/testing/gtest.gyp:gtest', 100 '<(DEPTH)/testing/gtest.gyp:gtest',
103 '<(DEPTH)/ui/gfx/gfx.gyp:gfx',
104 '<(DEPTH)/ui/gl/gl.gyp:gl', 101 '<(DEPTH)/ui/gl/gl.gyp:gl',
105 '<(DEPTH)/ui/ui.gyp:ui', 102 '<(DEPTH)/ui/ui.gyp:ui',
106 '<(DEPTH)/ui/ui.gyp:ui_resources', 103 '<(DEPTH)/ui/ui.gyp:ui_resources',
107 'compositor', 104 'compositor',
108 'compositor_test_support', 105 'compositor_test_support',
109 ], 106 ],
110 'sources': [ 107 'sources': [
111 'layer_animation_element_unittest.cc', 108 'layer_animation_element_unittest.cc',
112 'layer_animation_sequence_unittest.cc', 109 'layer_animation_sequence_unittest.cc',
113 'layer_animator_unittest.cc', 110 'layer_animator_unittest.cc',
(...skipping 27 matching lines...) Expand all
141 'dependencies': [ 138 'dependencies': [
142 '<(DEPTH)/base/allocator/allocator.gyp:allocator', 139 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
143 ], 140 ],
144 }], 141 }],
145 ], 142 ],
146 }], 143 }],
147 ], 144 ],
148 }, 145 },
149 ], 146 ],
150 } 147 }
OLDNEW
« no previous file with comments | « trunk/src/ui/aura/aura.gyp ('k') | trunk/src/ui/gfx/android/gfx_jni_registrar.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698