diff options
| author | vchigrin <vchigrin@yandex-team.ru> | 2015-01-16 03:33:13 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-01-16 11:33:58 +0000 |
| commit | 8463118f789f8d4b93ce23b5abfff967c288f082 (patch) | |
| tree | 455bdde687a7defb6d6eebf9186f73745917b746 | |
| parent | 692fbd4126597cfa3908a9ffd23b2ad72c475c42 (diff) | |
| download | chromium_src-8463118f789f8d4b93ce23b5abfff967c288f082.zip chromium_src-8463118f789f8d4b93ce23b5abfff967c288f082.tar.gz chromium_src-8463118f789f8d4b93ce23b5abfff967c288f082.tar.bz2 | |
Fix few errors in ui/views in Windows GN build.
R=sky@chromium.org,sadrul@chromium.org
Review URL: https://codereview.chromium.org/803123004
Cr-Commit-Position: refs/heads/master@{#311864}
| -rw-r--r-- | ui/views/BUILD.gn | 6 | ||||
| -rw-r--r-- | ui/views/views.gyp | 18 |
2 files changed, 20 insertions, 4 deletions
diff --git a/ui/views/BUILD.gn b/ui/views/BUILD.gn index bafe518..5b24f7f 100644 --- a/ui/views/BUILD.gn +++ b/ui/views/BUILD.gn @@ -103,6 +103,9 @@ component("views") { } else if (use_ozone) { sources += gypi_values.views_desktop_aura_ozone_sources } + if (is_linux) { + sources += gypi_values.views_desktop_aura_linux_sources + } } } @@ -225,6 +228,9 @@ test("views_unittests") { deps += [ "//ui/aura:test_support" ] if (!is_chromeos) { sources += gypi_values.views_unittests_desktop_aura_sources + if (use_x11) { + sources += gypi_values.views_unittests_desktop_aurax11_sources + } } } if (use_x11) { diff --git a/ui/views/views.gyp b/ui/views/views.gyp index 8615288..e20e8f8 100644 --- a/ui/views/views.gyp +++ b/ui/views/views.gyp @@ -401,8 +401,6 @@ 'widget/desktop_aura/desktop_capture_client.cc', 'widget/desktop_aura/desktop_capture_client.h', 'widget/desktop_aura/desktop_cursor_loader_updater.h', - 'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc', - 'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h', 'widget/desktop_aura/desktop_dispatcher_client.cc', 'widget/desktop_aura/desktop_dispatcher_client.h', 'widget/desktop_aura/desktop_drop_target_win.cc', @@ -420,6 +418,10 @@ 'widget/desktop_aura/desktop_screen_position_client.cc', 'widget/desktop_aura/desktop_screen_position_client.h', ], + 'views_desktop_aura_linux_sources': [ + 'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.cc', + 'widget/desktop_aura/desktop_cursor_loader_updater_auralinux.h', + ], 'views_desktop_aura_x11_sources': [ 'widget/desktop_aura/desktop_drag_drop_client_aurax11.cc', 'widget/desktop_aura/desktop_drag_drop_client_aurax11.h', @@ -570,11 +572,13 @@ 'touchui/touch_selection_controller_impl_unittest.cc', ], 'views_unittests_desktop_aura_sources': [ - 'widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc', 'widget/desktop_aura/desktop_focus_rules_unittest.cc', 'widget/desktop_aura/desktop_native_widget_aura_unittest.cc', - 'widget/desktop_aura/desktop_screen_x11_unittest.cc', 'widget/desktop_aura/desktop_screen_position_client_unittest.cc', + ], + 'views_unittests_desktop_aurax11_sources': [ + 'widget/desktop_aura/desktop_drag_drop_client_aurax11_unittest.cc', + 'widget/desktop_aura/desktop_screen_x11_unittest.cc', 'widget/desktop_aura/desktop_window_tree_host_x11_unittest.cc', ], }, @@ -689,6 +693,9 @@ ['use_aura and chromeos == 0', { 'sources': [ '<@(views_desktop_aura_sources)' ], 'conditions': [ + ['OS == "linux"', { + 'sources': [ '<@(views_desktop_aura_linux_sources)' ], + }], ['use_x11 == 1', { 'sources': [ '<@(views_desktop_aura_x11_sources)' ], }], @@ -841,6 +848,9 @@ ['chromeos == 0', { 'sources': [ '<@(views_unittests_desktop_aura_sources)' ], }], + ['chromeos == 0 and use_x11==1', { + 'sources': [ '<@(views_unittests_desktop_aurax11_sources)' ], + }], ] }], ['use_x11==1', { |