| OLD | NEW |
| 1 # Copyright 2014 The Chromium Authors. All rights reserved. | 1 # Copyright 2014 The Chromium Authors. All rights reserved. |
| 2 # Use of this source code is governed by a BSD-style license that can be | 2 # Use of this source code is governed by a BSD-style license that can be |
| 3 # found in the LICENSE file. | 3 # found in the LICENSE file. |
| 4 | 4 |
| 5 import("//build/config/features.gni") | 5 import("//build/config/features.gni") |
| 6 import("//build/config/ui.gni") | 6 import("//build/config/ui.gni") |
| 7 | 7 |
| 8 gypi_values = exec_script( | 8 gypi_values = exec_script( |
| 9 "//build/gypi_to_gn.py", | 9 "//build/gypi_to_gn.py", |
| 10 [ rebase_path("ash.gyp") ], | 10 [ rebase_path("ash.gyp") ], |
| (...skipping 56 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 67 "//build/config/linux:xfixes", | 67 "//build/config/linux:xfixes", |
| 68 ] | 68 ] |
| 69 } else { | 69 } else { |
| 70 sources -= [ | 70 sources -= [ |
| 71 "accelerators/key_hold_detector.cc", | 71 "accelerators/key_hold_detector.cc", |
| 72 "accelerators/key_hold_detector.h", | 72 "accelerators/key_hold_detector.h", |
| 73 "accelerators/magnifier_key_scroller.cc", | 73 "accelerators/magnifier_key_scroller.cc", |
| 74 "accelerators/magnifier_key_scroller.h", | 74 "accelerators/magnifier_key_scroller.h", |
| 75 "accelerators/spoken_feedback_toggler.cc", | 75 "accelerators/spoken_feedback_toggler.cc", |
| 76 "accelerators/spoken_feedback_toggler.h", | 76 "accelerators/spoken_feedback_toggler.h", |
| 77 "host/ash_window_tree_host_x11.cc", |
| 78 "host/ash_window_tree_host_x11.h", |
| 79 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", |
| 80 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", |
| 77 ] | 81 ] |
| 78 } | 82 } |
| 79 | 83 |
| 80 if (is_chromeos) { | 84 if (is_chromeos) { |
| 81 deps += [ | 85 deps += [ |
| 82 "//device/bluetooth", | 86 "//device/bluetooth", |
| 83 "//ui/display", | 87 "//ui/display", |
| 84 "//ui/display/util", | 88 "//ui/display/util", |
| 85 "//chromeos", | 89 "//chromeos", |
| 86 "//chromeos:power_manager_proto", | 90 "//chromeos:power_manager_proto", |
| 87 "//ui/chromeos/resources", | 91 "//ui/chromeos/resources", |
| 88 "//ui/chromeos/strings", | 92 "//ui/chromeos/strings", |
| 89 "//ui/chromeos:ui_chromeos", | 93 "//ui/chromeos:ui_chromeos", |
| 90 ] | 94 ] |
| 91 } else { | 95 } else { |
| 92 sources -= [ | 96 sources -= [ |
| 93 "display/display_configurator_animation.cc", | 97 "display/display_configurator_animation.cc", |
| 94 "display/display_configurator_animation.h", | 98 "display/display_configurator_animation.h", |
| 95 "display/resolution_notification_controller.cc", | 99 "display/resolution_notification_controller.cc", |
| 96 "display/resolution_notification_controller.h", | 100 "display/resolution_notification_controller.h", |
| 97 "system/tray/media_security/media_capture_observer.h", | 101 "system/tray/media_security/media_capture_observer.h", |
| 98 "system/tray/media_security/multi_profile_media_tray_item.cc", | 102 "system/tray/media_security/multi_profile_media_tray_item.cc", |
| 99 "system/tray/media_security/multi_profile_media_tray_item.h", | 103 "system/tray/media_security/multi_profile_media_tray_item.h", |
| 104 "touch/touch_transformer_controller.cc", |
| 105 "touch/touch_transformer_controller.h", |
| 106 "touch/touchscreen_util.cc", |
| 107 "touch/touchscreen_util.h", |
| 100 "virtual_keyboard_controller.cc", | 108 "virtual_keyboard_controller.cc", |
| 101 "virtual_keyboard_controller.h", | 109 "virtual_keyboard_controller.h", |
| 102 ] | 110 ] |
| 103 } | 111 } |
| 104 | 112 |
| 105 if (!use_x11 || !is_chromeos) { | |
| 106 sources -= [ | |
| 107 "touch/touch_transformer_controller.cc", | |
| 108 "touch/touch_transformer_controller.h", | |
| 109 "touch/touchscreen_util.cc", | |
| 110 "touch/touchscreen_util.h", | |
| 111 ] | |
| 112 } | |
| 113 | |
| 114 if (!use_ozone) { | 113 if (!use_ozone) { |
| 115 sources -= [ | 114 sources -= [ |
| 116 "host/ash_window_tree_host_ozone.cc", | 115 "host/ash_window_tree_host_ozone.cc", |
| 117 ] | 116 ] |
| 118 } | 117 } |
| 119 } | 118 } |
| 120 | 119 |
| 121 component("ash_with_content") { | 120 component("ash_with_content") { |
| 122 sources = [ | 121 sources = [ |
| 123 "content_support/ash_with_content_export.h", | 122 "content_support/ash_with_content_export.h", |
| (...skipping 170 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 294 } | 293 } |
| 295 | 294 |
| 296 if (is_win) { | 295 if (is_win) { |
| 297 cflags = [ "/wd4267" ] | 296 cflags = [ "/wd4267" ] |
| 298 } | 297 } |
| 299 | 298 |
| 300 if (!use_x11) { | 299 if (!use_x11) { |
| 301 sources -= [ | 300 sources -= [ |
| 302 "accelerators/magnifier_key_scroller_unittest.cc", | 301 "accelerators/magnifier_key_scroller_unittest.cc", |
| 303 "accelerators/spoken_feedback_toggler_unittest.cc", | 302 "accelerators/spoken_feedback_toggler_unittest.cc", |
| 303 "host/ash_window_tree_host_x11_unittest.cc", |
| 304 ] | 304 ] |
| 305 } | 305 } |
| 306 if (is_chromeos) { | 306 if (is_chromeos) { |
| 307 sources += [ "first_run/first_run_helper_unittest.cc" ] | 307 sources += [ "first_run/first_run_helper_unittest.cc" ] |
| 308 deps += [ | 308 deps += [ |
| 309 "//device/bluetooth", | 309 "//device/bluetooth", |
| 310 "//ui/display", | 310 "//ui/display", |
| 311 "//ui/display:test_util", | 311 "//ui/display:test_util", |
| 312 "//ui/display/types", | 312 "//ui/display/types", |
| 313 "//chromeos:power_manager_proto", | 313 "//chromeos:power_manager_proto", |
| (...skipping 61 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 375 "//content/test:test_support", | 375 "//content/test:test_support", |
| 376 "//skia", | 376 "//skia", |
| 377 "//testing/gtest", | 377 "//testing/gtest", |
| 378 "//ui/accessibility", | 378 "//ui/accessibility", |
| 379 ] | 379 ] |
| 380 | 380 |
| 381 if (is_chromeos) { | 381 if (is_chromeos) { |
| 382 deps += [ "//ui/display" ] | 382 deps += [ "//ui/display" ] |
| 383 } | 383 } |
| 384 } | 384 } |
| OLD | NEW |