Chromium Code Reviews| Index: ui/views/views.gyp |
| diff --git a/ui/views/views.gyp b/ui/views/views.gyp |
| index b57a8158d635d32d2181e1450e808b6e4f810ae5..d2ae670514a0ebc561cc7df2772f11a8bca28316 100644 |
| --- a/ui/views/views.gyp |
| +++ b/ui/views/views.gyp |
| @@ -490,6 +490,10 @@ |
| 'widget/desktop_aura/desktop_screen_ozone.cc', |
| 'widget/desktop_aura/desktop_window_tree_host_ozone.cc', |
| ], |
| + 'views_desktop_aura_ozone_wayland_sources': [ |
| + 'widget/desktop_aura/desktop_factory_ozone_wayland.cc', |
| + 'widget/desktop_aura/desktop_factory_ozone_wayland.h', |
| + ], |
| 'views_test_support_sources': [ |
| 'animation/test/flood_fill_ink_drop_ripple_test_api.cc', |
| 'animation/test/flood_fill_ink_drop_ripple_test_api.h', |
| @@ -807,7 +811,46 @@ |
| 'sources': [ '<@(views_desktop_aura_win_sources)' ], |
| }], |
| ['use_ozone==1', { |
| - 'sources': [ '<@(views_desktop_aura_ozone_sources)' ], |
| + 'sources': [ |
| + '<@(views_desktop_aura_ozone_sources)', |
| + '<(desktop_factory_ozone_list_cc_file)', |
| + ], |
| + |
| + 'conditions': [ |
| + ['ozone_platform_wayland == 1', { |
| + 'sources': [ '<@(views_desktop_aura_ozone_wayland_sources)' ], |
| + |
| + }], |
| + ], |
| + 'variables': { |
| + 'platform_list_txt_file': '<(SHARED_INTERMEDIATE_DIR)/ui/ozone/platform_list.txt', |
| + 'desktop_factory_ozone_list_cc_file': '<(INTERMEDIATE_DIR)/ui/views/desktop_factory_ozone_list.cc', |
| + }, |
| + 'actions': [ |
| + { |
| + # GN version: //ui/views:generate_constructor_list |
| + 'action_name': 'generate_constructor_list', |
| + 'variables': { |
| + 'generator_path': '../ozone/generate_constructor_list.py', |
| + }, |
| + 'inputs': [ |
| + '<(generator_path)', |
| + '<(platform_list_txt_file)', |
| + ], |
| + 'outputs': [ |
| + '<(desktop_factory_ozone_list_cc_file)', |
| + ], |
| + 'action': [ |
| + 'python', |
| + '<(generator_path)', |
| + '--platform_list=<(platform_list_txt_file)', |
|
joone
2016/06/06 22:37:58
How about passing '--platform=wayland' instead of
joone
2016/06/07 00:04:16
We had better create DesktopFactoryOzone(Headless|
|
| + '--output_cc=<(desktop_factory_ozone_list_cc_file)', |
| + '--namespace=views', |
| + '--typename=DesktopFactoryOzone', |
| + '--include="ui/views/widget/desktop_aura/desktop_factory_ozone.h"', |
| + ], |
| + }, |
| + ], |
| }], |
| ], |
| }], |