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

Side by Side Diff: ui/gfx/compositor/compositor.gyp

Issue 7744059: Add dynamic_annotations dependency on ui to fix a crash on linux desktop touchui component build. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « no previous file | no next file » | 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 9 'target_defaults': {
10 'sources/': [ 10 'sources/': [
11 ['exclude', '_(gl|win)\\.(cc?)$'], 11 ['exclude', '_(gl|win)\\.(cc?)$'],
12 ], 12 ],
13 'conditions': [ 13 'conditions': [
14 ['os_posix == 1 and OS != "mac"', { 14 ['os_posix == 1 and OS != "mac"', {
15 'sources/': [['include', '_(gl)\\.(h|cc)$'],] 15 'sources/': [['include', '_(gl)\\.(h|cc)$'],]
16 }], 16 }],
17 ['OS == "win"', { 17 ['OS == "win"', {
18 'sources/': [['include', '_(win)\\.(h|cc)$'],] 18 'sources/': [['include', '_(win)\\.(h|cc)$'],]
19 }], 19 }],
20 ], 20 ],
21 }, 21 },
22 'targets': [ 22 'targets': [
23 { 23 {
24 'target_name': 'compositor', 24 'target_name': 'compositor',
25 'type': '<(component)', 25 'type': '<(component)',
26 'dependencies': [ 26 'dependencies': [
27 '<(DEPTH)/base/base.gyp:base', 27 '<(DEPTH)/base/base.gyp:base',
28 '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:d ynamic_annotations',
28 '<(DEPTH)/skia/skia.gyp:skia', 29 '<(DEPTH)/skia/skia.gyp:skia',
29 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl', 30 '<(DEPTH)/ui/gfx/gl/gl.gyp:gl',
30 '<(DEPTH)/ui/ui.gyp:ui', 31 '<(DEPTH)/ui/ui.gyp:ui',
31 ], 32 ],
32 'defines': [ 33 'defines': [
33 'COMPOSITOR_IMPLEMENTATION', 34 'COMPOSITOR_IMPLEMENTATION',
34 ], 35 ],
35 'sources': [ 36 'sources': [
36 'compositor.cc', 37 'compositor.cc',
37 'compositor.h', 38 'compositor.h',
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
70 }], 71 }],
71 ['OS == "win" and views_compositor == 0', { 72 ['OS == "win" and views_compositor == 0', {
72 'sources/': [ 73 'sources/': [
73 ['exclude', '^compositor_win.cc'], 74 ['exclude', '^compositor_win.cc'],
74 ], 75 ],
75 }], 76 }],
76 ], 77 ],
77 }, 78 },
78 ], 79 ],
79 } 80 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698