Index: ash/ash.gyp |
diff --git a/ash/ash.gyp b/ash/ash.gyp |
index 5883fb1411f61a6acbac981da04e9edf8fb378b7..ab2c6e3e580ec36af1b0672bb305de81fb9fdc09 100644 |
--- a/ash/ash.gyp |
+++ b/ash/ash.gyp |
@@ -60,6 +60,18 @@ |
'desktop_background/desktop_background_resources.h', |
'desktop_background/desktop_background_view.cc', |
'desktop_background/desktop_background_view.h', |
+ 'display/display_controller.cc', |
+ 'display/display_controller.h', |
+ 'display/output_configurator_animation.cc', |
+ 'display/output_configurator_animation.h', |
+ 'display/mouse_cursor_event_filter.cc', |
+ 'display/mouse_cursor_event_filter.h', |
+ 'display/multi_display_manager.cc', |
+ 'display/multi_display_manager.h', |
+ 'display/screen_position_controller.cc', |
+ 'display/screen_position_controller.h', |
+ 'display/secondary_display_view.cc', |
+ 'display/secondary_display_view.h', |
'drag_drop/drag_drop_controller.cc', |
'drag_drop/drag_drop_controller.h', |
'drag_drop/drag_image_view.cc', |
@@ -100,16 +112,6 @@ |
'launcher/tabbed_launcher_button.h', |
'magnifier/magnification_controller.cc', |
'magnifier/magnification_controller.h', |
- 'display/display_controller.cc', |
- 'display/display_controller.h', |
- 'display/mouse_cursor_event_filter.cc', |
- 'display/mouse_cursor_event_filter.h', |
- 'display/multi_display_manager.cc', |
- 'display/multi_display_manager.h', |
- 'display/screen_position_controller.cc', |
- 'display/screen_position_controller.h', |
- 'display/secondary_display_view.cc', |
- 'display/secondary_display_view.h', |
'root_window_controller.cc', |
'root_window_controller.h', |
'rotator/screen_rotation.cc', |
@@ -350,6 +352,11 @@ |
'dependencies': [ |
'../chromeos/chromeos.gyp:chromeos', |
], |
+ }, { # else: chromeos!=1 |
+ 'sources/': [ |
+ ['exclude', 'display/output_configurator_animation.cc'], |
+ ['exclude', 'display/output_configurator_animation.h'], |
+ ], |
}], |
], |
}, |