Chromium Code Reviews| Index: ui/touch_selection/ui_touch_selection.gyp |
| diff --git a/ui/touch_selection/ui_touch_selection.gyp b/ui/touch_selection/ui_touch_selection.gyp |
| index 851c26f49a4ce13eda4a1cd576348bd8d7ca110a..a31bf3ccd6832bd719fe24347492ef926aef300a 100644 |
| --- a/ui/touch_selection/ui_touch_selection.gyp |
| +++ b/ui/touch_selection/ui_touch_selection.gyp |
| @@ -12,9 +12,13 @@ |
| 'type': '<(component)', |
| 'dependencies': [ |
| '../../base/base.gyp:base', |
| + '../aura/aura.gyp:aura', |
| + '../aura_extra/aura_extra.gyp:aura_extra', |
| '../base/ui_base.gyp:ui_base', |
| + '../compositor/compositor.gyp:compositor', |
| '../events/events.gyp:events', |
| '../events/events.gyp:gesture_detection', |
| + '../gfx/gfx.gyp:gfx', |
| '../gfx/gfx.gyp:gfx_geometry', |
| ], |
| 'defines': [ |
| @@ -24,6 +28,8 @@ |
| 'selection_event_type.h', |
| 'touch_handle.cc', |
| 'touch_handle.h', |
| + 'touch_handle_drawable_aura.cc', |
| + 'touch_handle_drawable_aura.h', |
| 'touch_handle_orientation.h', |
| 'touch_selection_controller.cc', |
| 'touch_selection_controller.h', |
| @@ -32,6 +38,20 @@ |
| 'include_dirs': [ |
| '../..', |
| ], |
| + 'conditions': [ |
| + ['use_aura==0', { |
| + 'dependencies!': [ |
|
jdduke (slow)
2015/05/07 20:38:15
Wouldn't it be simpler to reverse this condition a
mohsen
2015/05/07 21:21:55
GYP documentation suggests adding all sources firs
|
| + '../aura/aura.gyp:aura', |
| + '../aura_extra/aura_extra.gyp:aura_extra', |
| + '../compositor/compositor.gyp:compositor', |
| + '../gfx/gfx.gyp:gfx', |
| + ], |
| + 'sources!': [ |
| + 'touch_handle_drawable_aura.cc', |
| + 'touch_handle_drawable_aura.h', |
| + ], |
| + }], |
| + ], |
| }, |
| { |
| 'target_name': 'ui_touch_selection_unittests', |