| Index: ui/ui.gyp
|
| ===================================================================
|
| --- ui/ui.gyp (revision 126124)
|
| +++ ui/ui.gyp (working copy)
|
| @@ -22,6 +22,8 @@
|
| '../base/base.gyp:base_i18n',
|
| '../base/base.gyp:base_static',
|
| '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
|
| + '../third_party/utouch-frame/utouch-frame.gyp:utouch-frame',
|
| + '../third_party/utouch-grail/utouch-grail.gyp:utouch-grail',
|
| '../build/temp_gyp/googleurl.gyp:googleurl',
|
| '../net/net.gyp:net',
|
| '../skia/skia.gyp:skia',
|
| @@ -211,6 +213,12 @@
|
| 'base/text/utf16_indexing.h',
|
| 'base/theme_provider.cc',
|
| 'base/theme_provider.h',
|
| + 'base/touch/axis.cc',
|
| + 'base/touch/axis.h',
|
| + 'base/touch/multi_touch_device.cc',
|
| + 'base/touch/multi_touch_device.h',
|
| + 'base/touch/multi_touch_device_x11.cc',
|
| + 'base/touch/multi_touch_device_x11.h',
|
| 'base/touch/touch_factory.cc',
|
| 'base/touch/touch_factory.h',
|
| 'base/ui_base_exports.cc',
|
| @@ -404,6 +412,16 @@
|
| 'gfx/native_theme_aura.h',
|
| ]
|
| }],
|
| + ['use_utouch==1', {
|
| + 'defines' : ['USE_UTOUCH'],
|
| + }, { #use_utouch!=1
|
| + 'dependencies!': [
|
| +# '../build/linux/system.gyp:utouch_frame',
|
| +# '../build/linux/system.gyp:utouch_grail',
|
| + '../third_party/utouch-frame/utouch-frame.gyp:utouch-frame',
|
| + '../third_party/utouch-grail/utouch-grail.gyp:utouch-grail',
|
| + ],
|
| + }],
|
| ['use_aura==1 and OS=="win"', {
|
| 'sources/': [
|
| ['exclude', 'base/dragdrop/os_exchange_data_provider_win.cc'],
|
|
|