projects
/
platform
/
framework
/
web
/
crosswalk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Upstream version 5.34.104.0
[platform/framework/web/crosswalk.git]
/
src
/
ui
/
ui_unittests.gyp
diff --git
a/src/ui/ui_unittests.gyp
b/src/ui/ui_unittests.gyp
index
552d8f9
..
9577c42
100644
(file)
--- a/
src/ui/ui_unittests.gyp
+++ b/
src/ui/ui_unittests.gyp
@@
-17,10
+17,6
@@
'gfx/gfx.gyp:gfx_geometry',
],
'sources': [
'gfx/gfx.gyp:gfx_geometry',
],
'sources': [
- 'base/test/cocoa_test_event_utils.h',
- 'base/test/cocoa_test_event_utils.mm',
- 'base/test/ui_cocoa_test_helper.h',
- 'base/test/ui_cocoa_test_helper.mm',
'base/test/ui_controls.h',
'base/test/ui_controls_aura.cc',
'base/test/ui_controls_gtk.cc',
'base/test/ui_controls.h',
'base/test/ui_controls_aura.cc',
'base/test/ui_controls_gtk.cc',
@@
-79,7
+75,6
@@
'gfx/gfx.gyp:gfx_geometry_unittests',
'gfx/gfx.gyp:gfx_test_support',
'resources/ui_resources.gyp:ui_resources',
'gfx/gfx.gyp:gfx_geometry_unittests',
'gfx/gfx.gyp:gfx_test_support',
'resources/ui_resources.gyp:ui_resources',
- 'shell_dialogs/shell_dialogs.gyp:shell_dialogs',
'ui.gyp:ui',
'ui_test_support',
],
'ui.gyp:ui',
'ui_test_support',
],
@@
-166,7
+161,6
@@
'gfx/sequential_id_generator_unittest.cc',
'gfx/transform_util_unittest.cc',
'gfx/utf16_indexing_unittest.cc',
'gfx/sequential_id_generator_unittest.cc',
'gfx/transform_util_unittest.cc',
'gfx/utf16_indexing_unittest.cc',
- 'shell_dialogs/select_file_dialog_win_unittest.cc',
],
'include_dirs': [
'../',
],
'include_dirs': [
'../',
@@
-190,11
+184,11
@@
}],
['OS == "win"', {
'sources': [
}],
['OS == "win"', {
'sources': [
- 'test/ui_unittests.rc',
'base/dragdrop/os_exchange_data_win_unittest.cc',
'base/win/hwnd_subclass_unittest.cc',
'gfx/font_fallback_win_unittest.cc',
'gfx/icon_util_unittest.cc',
'base/dragdrop/os_exchange_data_win_unittest.cc',
'base/win/hwnd_subclass_unittest.cc',
'gfx/font_fallback_win_unittest.cc',
'gfx/icon_util_unittest.cc',
+ 'gfx/icon_util_unittests.rc',
'gfx/platform_font_win_unittest.cc',
],
'include_dirs': [
'gfx/platform_font_win_unittest.cc',
],
'include_dirs': [
@@
-252,11
+246,6
@@
'../base/allocator/allocator.gyp:allocator',
],
}],
'../base/allocator/allocator.gyp:allocator',
],
}],
- ['toolkit_views==1', {
- 'sources!': [
- 'browser/ui/gtk/gtk_expanded_container_unittest.cc',
- ],
- }],
],
}],
['use_x11==1', {
],
}],
['use_x11==1', {
@@
-287,6
+276,12
@@
'base/cursor/cursor_loader_x11_unittest.cc',
],
}],
'base/cursor/cursor_loader_x11_unittest.cc',
],
}],
+ ['OS=="mac"', {
+ 'dependencies': [
+ 'events/events.gyp:events_test_support',
+ 'gfx/gfx.gyp:gfx_test_support',
+ ],
+ }],
['use_aura==1 or toolkit_views==1', {
'sources': [
'base/dragdrop/os_exchange_data_unittest.cc',
['use_aura==1 or toolkit_views==1', {
'sources': [
'base/dragdrop/os_exchange_data_unittest.cc',
@@
-299,7
+294,6
@@
}],
['use_aura==1', {
'sources!': [
}],
['use_aura==1', {
'sources!': [
- 'base/dialogs/select_file_dialog_win_unittest.cc',
'base/dragdrop/os_exchange_data_win_unittest.cc',
'gfx/screen_unittest.cc',
],
'base/dragdrop/os_exchange_data_win_unittest.cc',
'gfx/screen_unittest.cc',
],