| 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("//build/gypi_to_gn.py", |
| 9 "//build/gypi_to_gn.py", | 9 [ rebase_path("ash.gyp") ], |
| 10 [ rebase_path("ash.gyp") ], | 10 "scope", |
| 11 "scope", | 11 [ "ash.gyp" ]) |
| 12 [ "ash.gyp" ]) | |
| 13 | 12 |
| 14 component("ash") { | 13 component("ash") { |
| 15 sources = gypi_values.ash_sources | 14 sources = gypi_values.ash_sources |
| 16 | 15 |
| 17 defines = [ "ASH_IMPLEMENTATION" ] | 16 defines = [ "ASH_IMPLEMENTATION" ] |
| 18 | 17 |
| 19 public_deps = [ | 18 public_deps = [ |
| 20 "//ash/resources", | 19 "//ash/resources", |
| 21 "//ash/strings", | 20 "//ash/strings", |
| 22 ] | 21 ] |
| (...skipping 28 matching lines...) Expand all Loading... |
| 51 "//ui/web_dialogs", | 50 "//ui/web_dialogs", |
| 52 "//ui/wm", | 51 "//ui/wm", |
| 53 "//url", | 52 "//url", |
| 54 ] | 53 ] |
| 55 | 54 |
| 56 if (is_win) { | 55 if (is_win) { |
| 57 sources -= [ | 56 sources -= [ |
| 58 "sticky_keys/sticky_keys_controller.cc", | 57 "sticky_keys/sticky_keys_controller.cc", |
| 59 "sticky_keys/sticky_keys_controller.h", | 58 "sticky_keys/sticky_keys_controller.h", |
| 60 ] | 59 ] |
| 60 |
| 61 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 61 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 62 cflags = [ "/wd4267" ] | 62 cflags = [ "/wd4267" ] |
| 63 } | 63 } |
| 64 | 64 |
| 65 if (use_x11) { | 65 if (use_x11) { |
| 66 configs += [ | 66 configs += [ "//build/config/linux:xfixes" ] |
| 67 "//build/config/linux:xfixes", | |
| 68 ] | |
| 69 } else { | 67 } else { |
| 70 sources -= [ | 68 sources -= [ |
| 71 "accelerators/key_hold_detector.cc", | 69 "accelerators/key_hold_detector.cc", |
| 72 "accelerators/key_hold_detector.h", | 70 "accelerators/key_hold_detector.h", |
| 73 "accelerators/magnifier_key_scroller.cc", | 71 "accelerators/magnifier_key_scroller.cc", |
| 74 "accelerators/magnifier_key_scroller.h", | 72 "accelerators/magnifier_key_scroller.h", |
| 75 "accelerators/spoken_feedback_toggler.cc", | 73 "accelerators/spoken_feedback_toggler.cc", |
| 76 "accelerators/spoken_feedback_toggler.h", | 74 "accelerators/spoken_feedback_toggler.h", |
| 77 "host/ash_window_tree_host_x11.cc", | 75 "host/ash_window_tree_host_x11.cc", |
| 78 "host/ash_window_tree_host_x11.h", | 76 "host/ash_window_tree_host_x11.h", |
| (...skipping 25 matching lines...) Expand all Loading... |
| 104 "touch/touch_transformer_controller.cc", | 102 "touch/touch_transformer_controller.cc", |
| 105 "touch/touch_transformer_controller.h", | 103 "touch/touch_transformer_controller.h", |
| 106 "touch/touchscreen_util.cc", | 104 "touch/touchscreen_util.cc", |
| 107 "touch/touchscreen_util.h", | 105 "touch/touchscreen_util.h", |
| 108 "virtual_keyboard_controller.cc", | 106 "virtual_keyboard_controller.cc", |
| 109 "virtual_keyboard_controller.h", | 107 "virtual_keyboard_controller.h", |
| 110 ] | 108 ] |
| 111 } | 109 } |
| 112 | 110 |
| 113 if (!use_ozone) { | 111 if (!use_ozone) { |
| 114 sources -= [ | 112 sources -= [ "host/ash_window_tree_host_ozone.cc" ] |
| 115 "host/ash_window_tree_host_ozone.cc", | |
| 116 ] | |
| 117 } | 113 } |
| 118 } | 114 } |
| 119 | 115 |
| 120 component("ash_with_content") { | 116 component("ash_with_content") { |
| 121 sources = [ | 117 sources = [ |
| 122 "content_support/ash_with_content_export.h", | 118 "content_support/ash_with_content_export.h", |
| 123 "content_support/gpu_support_impl.cc", | 119 "content_support/gpu_support_impl.cc", |
| 124 "content_support/gpu_support_impl.h", | 120 "content_support/gpu_support_impl.h", |
| 125 "screensaver/screensaver_view.cc", | 121 "screensaver/screensaver_view.cc", |
| 126 "screensaver/screensaver_view.h", | 122 "screensaver/screensaver_view.h", |
| (...skipping 71 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 198 sources = gypi_values.ash_shell_lib_sources | 194 sources = gypi_values.ash_shell_lib_sources |
| 199 | 195 |
| 200 deps = [ | 196 deps = [ |
| 201 ":ash", | 197 ":ash", |
| 202 ":ash_with_content", | 198 ":ash_with_content", |
| 203 ":test_support", | 199 ":test_support", |
| 204 "//ash/resources", | 200 "//ash/resources", |
| 205 "//ash/strings", | 201 "//ash/strings", |
| 206 "//base", | 202 "//base", |
| 207 "//base:i18n", | 203 "//base:i18n", |
| 204 |
| 208 #"//chrome:packed_resources", TODO(GYP) | 205 #"//chrome:packed_resources", TODO(GYP) |
| 209 "//content", | 206 "//content", |
| 210 "//content/shell:content_shell_lib", | 207 "//content/shell:content_shell_lib", |
| 211 "//net", | 208 "//net", |
| 212 "//skia", | 209 "//skia", |
| 213 "//third_party/icu", | 210 "//third_party/icu", |
| 214 "//ui/app_list", | 211 "//ui/app_list", |
| 215 "//ui/aura", | 212 "//ui/aura", |
| 216 "//ui/base", | 213 "//ui/base", |
| 217 "//ui/compositor", | 214 "//ui/compositor", |
| (...skipping 52 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 270 "//ui/views/controls/webview:test_support", | 267 "//ui/views/controls/webview:test_support", |
| 271 "//ui/web_dialogs:test_support", | 268 "//ui/web_dialogs:test_support", |
| 272 "//ui/wm", | 269 "//ui/wm", |
| 273 "//url", | 270 "//url", |
| 274 ] | 271 ] |
| 275 | 272 |
| 276 if (!is_chromeos) { | 273 if (!is_chromeos) { |
| 277 sources -= [ | 274 sources -= [ |
| 278 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 | 275 # TODO(zork): fix this test to build on Windows. See: crosbug.com/26906 |
| 279 "focus_cycler_unittest.cc", | 276 "focus_cycler_unittest.cc", |
| 277 |
| 280 # All tests for multiple displays: not supported on Windows Ash. | 278 # All tests for multiple displays: not supported on Windows Ash. |
| 281 "wm/drag_window_resizer_unittest.cc", | 279 "wm/drag_window_resizer_unittest.cc", |
| 280 |
| 282 # Can't resize on Windows Ash. http://crbug.com/165962 | 281 # Can't resize on Windows Ash. http://crbug.com/165962 |
| 283 "magnifier/magnification_controller_unittest.cc", | 282 "magnifier/magnification_controller_unittest.cc", |
| 284 "wm/workspace/workspace_window_resizer_unittest.cc", | 283 "wm/workspace/workspace_window_resizer_unittest.cc", |
| 285 "sticky_keys/sticky_keys_overlay_unittest.cc", | 284 "sticky_keys/sticky_keys_overlay_unittest.cc", |
| 286 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", | 285 "system/tray/media_security/multi_profile_media_tray_item_unittest.cc", |
| 287 "autoclick/autoclick_unittest.cc", | 286 "autoclick/autoclick_unittest.cc", |
| 288 "virtual_keyboard_controller_unittest.cc", | 287 "virtual_keyboard_controller_unittest.cc", |
| 289 ] | 288 ] |
| 290 sources += [ | 289 sources += [ |
| 291 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) | 290 #'<(SHARED_INTERMEDIATE_DIR)/ui/resources/ui_unscaled_resources.rc', TODO
(GYP) |
| (...skipping 22 matching lines...) Expand all Loading... |
| 314 "//chromeos:test_support_without_gmock", | 313 "//chromeos:test_support_without_gmock", |
| 315 ] | 314 ] |
| 316 } else { | 315 } else { |
| 317 sources -= [ | 316 sources -= [ |
| 318 "display/resolution_notification_controller_unittest.cc", | 317 "display/resolution_notification_controller_unittest.cc", |
| 319 "touch/touchscreen_util_unittest.cc", | 318 "touch/touchscreen_util_unittest.cc", |
| 320 ] | 319 ] |
| 321 } | 320 } |
| 322 | 321 |
| 323 if (!use_x11 || !is_chromeos) { | 322 if (!use_x11 || !is_chromeos) { |
| 324 sources -= [ "touch/touch_transformer_controller_unittest.cc", ] | 323 sources -= [ "touch/touch_transformer_controller_unittest.cc" ] |
| 325 } | 324 } |
| 326 | 325 |
| 327 # TODO(GYP) is this necessary? | 326 # TODO(GYP) is this necessary? |
| 328 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { | 327 #['OS=="linux" and component=="shared_library" and use_allocator!="none"', { |
| 329 # ldflags = "-rdynamic" | 328 # ldflags = "-rdynamic" |
| 330 | 329 |
| 331 if (!is_chromeos || use_ozone) { | 330 if (!is_chromeos || use_ozone) { |
| 332 sources -= [ | 331 sources -= [ "sticky_keys/sticky_keys_unittest.cc" ] # crbug.com/354035 |
| 333 "sticky_keys/sticky_keys_unittest.cc", # crbug.com/354035 | |
| 334 ] | |
| 335 } | 332 } |
| 336 } | 333 } |
| 337 | 334 |
| 338 executable("ash_shell") { | 335 executable("ash_shell") { |
| 339 testonly = true | 336 testonly = true |
| 340 sources = [ | 337 sources = [ |
| 341 "shell/shell_main.cc", | 338 "shell/shell_main.cc", |
| 342 ] | 339 ] |
| 343 | 340 |
| 344 deps = [ | 341 deps = [ |
| 345 ":ash_shell_lib", | 342 ":ash_shell_lib", |
| 346 "//components/user_manager", | 343 "//components/user_manager", |
| 347 ] | 344 ] |
| 348 | 345 |
| 349 if (is_win) { | 346 if (is_win) { |
| 350 configs -= [ "//build/config/win:console" ] | 347 configs -= [ "//build/config/win:console" ] |
| 351 configs += [ "//build/config/win:windowed" ] | 348 configs += [ "//build/config/win:windowed" ] |
| 352 deps += [ | 349 deps += [ "//sandbox" ] |
| 353 "//sandbox", | |
| 354 ] | |
| 355 } | 350 } |
| 356 | 351 |
| 357 if (is_chromeos) { | 352 if (is_chromeos) { |
| 358 deps += [ | 353 deps += [ "//device/bluetooth" ] |
| 359 "//device/bluetooth", | |
| 360 ] | |
| 361 } | 354 } |
| 362 } | 355 } |
| 363 | 356 |
| 364 test("ash_shell_unittests") { | 357 test("ash_shell_unittests") { |
| 365 sources = [ | 358 sources = [ |
| 366 "shell/window_watcher_unittest.cc", | 359 "shell/window_watcher_unittest.cc", |
| 367 "test/ash_unittests.cc", | 360 "test/ash_unittests.cc", |
| 368 ] | 361 ] |
| 369 | 362 |
| 370 deps = [ | 363 deps = [ |
| 371 ":ash_shell_lib", | 364 ":ash_shell_lib", |
| 372 ":test_support", | 365 ":test_support", |
| 373 "//base/test:test_support", | 366 "//base/test:test_support", |
| 374 "//components/user_manager", | 367 "//components/user_manager", |
| 375 "//content/test:test_support", | 368 "//content/test:test_support", |
| 376 "//skia", | 369 "//skia", |
| 377 "//testing/gtest", | 370 "//testing/gtest", |
| 378 "//ui/accessibility", | 371 "//ui/accessibility", |
| 379 ] | 372 ] |
| 380 | 373 |
| 381 if (is_chromeos) { | 374 if (is_chromeos) { |
| 382 deps += [ "//ui/display" ] | 375 deps += [ "//ui/display" ] |
| 383 } | 376 } |
| 384 } | 377 } |
| OLD | NEW |