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

Side by Side Diff: trunk/src/ui/aura/aura.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/app_list/app_list.gyp ('k') | trunk/src/ui/compositor/compositor.gyp » ('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': 'aura', 11 'target_name': 'aura',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '../../base/base.gyp:base', 14 '../../base/base.gyp:base',
15 '../../base/base.gyp:base_i18n', 15 '../../base/base.gyp:base_i18n',
16 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations', 16 '../../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dyna mic_annotations',
17 '../../cc/cc.gyp:cc', 17 '../../cc/cc.gyp:cc',
18 '../../gpu/gpu.gyp:gpu', 18 '../../gpu/gpu.gyp:gpu',
19 '../../skia/skia.gyp:skia', 19 '../../skia/skia.gyp:skia',
20 '../compositor/compositor.gyp:compositor', 20 '../compositor/compositor.gyp:compositor',
21 '../gfx/gfx.gyp:gfx',
22 '../ui.gyp:ui', 21 '../ui.gyp:ui',
23 '../ui.gyp:ui_resources', 22 '../ui.gyp:ui_resources',
24 ], 23 ],
25 'defines': [ 24 'defines': [
26 'AURA_IMPLEMENTATION', 25 'AURA_IMPLEMENTATION',
27 ], 26 ],
28 'sources': [ 27 'sources': [
29 'client/activation_change_observer.h', 28 'client/activation_change_observer.h',
30 'client/activation_change_observer.cc', 29 'client/activation_change_observer.cc',
31 'client/activation_client.cc', 30 'client/activation_client.cc',
(...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after
118 ], 117 ],
119 }], 118 }],
120 ], 119 ],
121 }, 120 },
122 { 121 {
123 'target_name': 'aura_test_support', 122 'target_name': 'aura_test_support',
124 'type': 'static_library', 123 'type': 'static_library',
125 'dependencies': [ 124 'dependencies': [
126 '../../skia/skia.gyp:skia', 125 '../../skia/skia.gyp:skia',
127 '../../testing/gtest.gyp:gtest', 126 '../../testing/gtest.gyp:gtest',
128 '../gfx/gfx.gyp:gfx',
129 '../ui.gyp:ui', 127 '../ui.gyp:ui',
130 '../ui.gyp:ui_test_support', 128 '../ui.gyp:ui_test_support',
131 'aura', 129 'aura',
132 'aura_test_support_pak', 130 'aura_test_support_pak',
133 ], 131 ],
134 'include_dirs': [ 132 'include_dirs': [
135 '..', 133 '..',
136 ], 134 ],
137 'sources': [ 135 'sources': [
138 'test/aura_test_base.cc', 136 'test/aura_test_base.cc',
(...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after
202 'target_name': 'aura_demo', 200 'target_name': 'aura_demo',
203 'type': 'executable', 201 'type': 'executable',
204 'dependencies': [ 202 'dependencies': [
205 '../../base/base.gyp:base', 203 '../../base/base.gyp:base',
206 '../../base/base.gyp:base_i18n', 204 '../../base/base.gyp:base_i18n',
207 '../../skia/skia.gyp:skia', 205 '../../skia/skia.gyp:skia',
208 '../../third_party/icu/icu.gyp:icui18n', 206 '../../third_party/icu/icu.gyp:icui18n',
209 '../../third_party/icu/icu.gyp:icuuc', 207 '../../third_party/icu/icu.gyp:icuuc',
210 '../compositor/compositor.gyp:compositor', 208 '../compositor/compositor.gyp:compositor',
211 '../compositor/compositor.gyp:compositor_test_support', 209 '../compositor/compositor.gyp:compositor_test_support',
212 '../gfx/gfx.gyp:gfx',
213 '../ui.gyp:ui', 210 '../ui.gyp:ui',
214 '../ui.gyp:ui_resources', 211 '../ui.gyp:ui_resources',
215 '../../ipc/ipc.gyp:ipc', 212 '../../ipc/ipc.gyp:ipc',
216 'aura', 213 'aura',
217 'aura_test_support', 214 'aura_test_support',
218 ], 215 ],
219 'include_dirs': [ 216 'include_dirs': [
220 '..', 217 '..',
221 ], 218 ],
222 'sources': [ 219 'sources': [
223 'demo/demo_main.cc', 220 'demo/demo_main.cc',
224 ], 221 ],
225 }, 222 },
226 { 223 {
227 'target_name': 'aura_bench', 224 'target_name': 'aura_bench',
228 'type': 'executable', 225 'type': 'executable',
229 'dependencies': [ 226 'dependencies': [
230 '../../base/base.gyp:base', 227 '../../base/base.gyp:base',
231 '../../base/base.gyp:base_i18n', 228 '../../base/base.gyp:base_i18n',
232 '../../skia/skia.gyp:skia', 229 '../../skia/skia.gyp:skia',
233 '../../third_party/icu/icu.gyp:icui18n', 230 '../../third_party/icu/icu.gyp:icui18n',
234 '../../third_party/icu/icu.gyp:icuuc', 231 '../../third_party/icu/icu.gyp:icuuc',
235 '../compositor/compositor.gyp:compositor', 232 '../compositor/compositor.gyp:compositor',
236 '../compositor/compositor.gyp:compositor_test_support', 233 '../compositor/compositor.gyp:compositor_test_support',
237 '../gfx/gfx.gyp:gfx',
238 '../ui.gyp:ui', 234 '../ui.gyp:ui',
239 '../ui.gyp:ui_resources', 235 '../ui.gyp:ui_resources',
240 'aura', 236 'aura',
241 'aura_test_support', 237 'aura_test_support',
242 ], 238 ],
243 'include_dirs': [ 239 'include_dirs': [
244 '..', 240 '..',
245 ], 241 ],
246 'sources': [ 242 'sources': [
247 'bench/bench_main.cc', 243 'bench/bench_main.cc',
248 ], 244 ],
249 }, 245 },
250 { 246 {
251 'target_name': 'aura_unittests', 247 'target_name': 'aura_unittests',
252 'type': 'executable', 248 'type': 'executable',
253 'dependencies': [ 249 'dependencies': [
254 '../../base/base.gyp:test_support_base', 250 '../../base/base.gyp:test_support_base',
255 '../../chrome/chrome_resources.gyp:packed_resources', 251 '../../chrome/chrome_resources.gyp:packed_resources',
256 '../../skia/skia.gyp:skia', 252 '../../skia/skia.gyp:skia',
257 '../../testing/gtest.gyp:gtest', 253 '../../testing/gtest.gyp:gtest',
258 '../compositor/compositor.gyp:compositor_test_support', 254 '../compositor/compositor.gyp:compositor_test_support',
259 '../compositor/compositor.gyp:compositor', 255 '../compositor/compositor.gyp:compositor',
260 '../gfx/gfx.gyp:gfx',
261 '../gl/gl.gyp:gl', 256 '../gl/gl.gyp:gl',
262 '../ui.gyp:ui', 257 '../ui.gyp:ui',
263 '../ui.gyp:ui_resources', 258 '../ui.gyp:ui_resources',
264 '../ui.gyp:ui_test_support', 259 '../ui.gyp:ui_test_support',
265 'aura_test_support', 260 'aura_test_support',
266 'aura', 261 'aura',
267 ], 262 ],
268 'include_dirs': [ 263 'include_dirs': [
269 '..', 264 '..',
270 ], 265 ],
(...skipping 15 matching lines...) Expand all
286 ['OS=="linux" and linux_use_tcmalloc==1', { 281 ['OS=="linux" and linux_use_tcmalloc==1', {
287 'dependencies': [ 282 'dependencies': [
288 # See http://crbug.com/162998#c4 for why this is needed. 283 # See http://crbug.com/162998#c4 for why this is needed.
289 '../../base/allocator/allocator.gyp:allocator', 284 '../../base/allocator/allocator.gyp:allocator',
290 ], 285 ],
291 }], 286 }],
292 ], 287 ],
293 }, 288 },
294 ], 289 ],
295 } 290 }
OLDNEW
« no previous file with comments | « trunk/src/ui/app_list/app_list.gyp ('k') | trunk/src/ui/compositor/compositor.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698