| 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 import("//testing/test.gni") | 7 import("//testing/test.gni") |
| 8 import("//ui/base/ui_features.gni") | 8 import("//ui/base/ui_features.gni") |
| 9 | 9 |
| 10 assert(use_aura) | 10 assert(use_aura) |
| (...skipping 63 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 74 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. | 74 # TODO(jschuh): crbug.com/167187 fix size_t to int truncations. |
| 75 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 75 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 76 } | 76 } |
| 77 | 77 |
| 78 if (use_x11) { | 78 if (use_x11) { |
| 79 configs += [ | 79 configs += [ |
| 80 "//build/config/linux:x11", | 80 "//build/config/linux:x11", |
| 81 "//build/config/linux:xfixes", | 81 "//build/config/linux:xfixes", |
| 82 ] | 82 ] |
| 83 deps += [ | 83 deps += [ |
| 84 "//ui/events/devices/x11", |
| 84 "//ui/events/platform", | 85 "//ui/events/platform", |
| 85 "//ui/gfx/x", | 86 "//ui/gfx/x", |
| 86 ] | 87 ] |
| 87 } else { | 88 } else { |
| 88 sources -= [ | 89 sources -= [ |
| 89 "host/ash_window_tree_host_x11.cc", | 90 "host/ash_window_tree_host_x11.cc", |
| 90 "host/ash_window_tree_host_x11.h", | 91 "host/ash_window_tree_host_x11.h", |
| 91 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", | 92 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.cc", |
| 92 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", | 93 "wm/maximize_mode/scoped_disable_internal_mouse_and_keyboard_x11.h", |
| 93 ] | 94 ] |
| (...skipping 384 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 478 configs += [ "//build/config/win:windowed" ] | 479 configs += [ "//build/config/win:windowed" ] |
| 479 deps += [ "//sandbox" ] | 480 deps += [ "//sandbox" ] |
| 480 } | 481 } |
| 481 | 482 |
| 482 if (is_chromeos) { | 483 if (is_chromeos) { |
| 483 deps += [ "//device/bluetooth" ] | 484 deps += [ "//device/bluetooth" ] |
| 484 } | 485 } |
| 485 } | 486 } |
| 486 # When adding support for isolates, please have a look at run-time dependencies | 487 # When adding support for isolates, please have a look at run-time dependencies |
| 487 # in the ash_unittests_run target in ash.gyp. | 488 # in the ash_unittests_run target in ash.gyp. |
| OLD | NEW |