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

Side by Side Diff: ui/touch_selection/ui_touch_selection.gyp

Issue 1128203009: Fix link errors with Skia in libui_touch_selection.so (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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
« 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 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 { 5 {
6 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 }, 8 },
9 'targets': [ 9 'targets': [
10 { 10 {
11 'target_name': 'ui_touch_selection', 11 'target_name': 'ui_touch_selection',
12 'type': '<(component)', 12 'type': '<(component)',
13 'dependencies': [ 13 'dependencies': [
14 '../../base/base.gyp:base', 14 '../../base/base.gyp:base',
15 '../../skia/skia.gyp:skia',
15 '../aura/aura.gyp:aura', 16 '../aura/aura.gyp:aura',
16 '../aura_extra/aura_extra.gyp:aura_extra', 17 '../aura_extra/aura_extra.gyp:aura_extra',
17 '../base/ui_base.gyp:ui_base', 18 '../base/ui_base.gyp:ui_base',
18 '../compositor/compositor.gyp:compositor', 19 '../compositor/compositor.gyp:compositor',
19 '../events/events.gyp:events', 20 '../events/events.gyp:events',
20 '../events/events.gyp:gesture_detection', 21 '../events/events.gyp:gesture_detection',
21 '../gfx/gfx.gyp:gfx', 22 '../gfx/gfx.gyp:gfx',
22 '../gfx/gfx.gyp:gfx_geometry', 23 '../gfx/gfx.gyp:gfx_geometry',
23 ], 24 ],
24 'defines': [ 25 'defines': [
25 'UI_TOUCH_SELECTION_IMPLEMENTATION', 26 'UI_TOUCH_SELECTION_IMPLEMENTATION',
26 ], 27 ],
27 'sources': [ 28 'sources': [
28 'selection_event_type.h', 29 'selection_event_type.h',
29 'touch_handle.cc', 30 'touch_handle.cc',
30 'touch_handle.h', 31 'touch_handle.h',
31 'touch_handle_drawable_aura.cc', 32 'touch_handle_drawable_aura.cc',
32 'touch_handle_drawable_aura.h', 33 'touch_handle_drawable_aura.h',
33 'touch_handle_orientation.h', 34 'touch_handle_orientation.h',
34 'touch_selection_controller.cc', 35 'touch_selection_controller.cc',
35 'touch_selection_controller.h', 36 'touch_selection_controller.h',
36 'ui_touch_selection_export.h', 37 'ui_touch_selection_export.h',
37 ], 38 ],
38 'include_dirs': [ 39 'include_dirs': [
39 '../..', 40 '../..',
40 ], 41 ],
41 'conditions': [ 42 'conditions': [
42 ['use_aura==0', { 43 ['use_aura==0', {
43 'dependencies!': [ 44 'dependencies!': [
44 '../aura/aura.gyp:aura', 45 '../aura/aura.gyp:aura',
jdduke (slow) 2015/05/13 20:26:31 Can you also exclude the skia dep here?
45 '../aura_extra/aura_extra.gyp:aura_extra', 46 '../aura_extra/aura_extra.gyp:aura_extra',
46 '../compositor/compositor.gyp:compositor', 47 '../compositor/compositor.gyp:compositor',
47 '../gfx/gfx.gyp:gfx', 48 '../gfx/gfx.gyp:gfx',
48 ], 49 ],
49 'sources!': [ 50 'sources!': [
50 'touch_handle_drawable_aura.cc', 51 'touch_handle_drawable_aura.cc',
51 'touch_handle_drawable_aura.h', 52 'touch_handle_drawable_aura.h',
52 ], 53 ],
53 }], 54 }],
54 ], 55 ],
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
135 'dependencies': [ 136 'dependencies': [
136 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 137 '../../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
137 ], 138 ],
138 }], 139 }],
139 ], 140 ],
140 }, 141 },
141 ], 142 ],
142 }], 143 }],
143 ], 144 ],
144 } 145 }
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