| 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/ui.gni") | 5 import("//build/config/ui.gni") |
| 6 import("//testing/test.gni") | 6 import("//testing/test.gni") |
| 7 | 7 |
| 8 if (is_chromeos) { | 8 if (is_chromeos) { |
| 9 component("display") { | 9 component("display") { |
| 10 sources = [ | 10 sources = [ |
| (...skipping 24 matching lines...) Expand all Loading... |
| 35 "chromeos/x11/native_display_event_dispatcher_x11.h", | 35 "chromeos/x11/native_display_event_dispatcher_x11.h", |
| 36 "display_export.h", | 36 "display_export.h", |
| 37 "display_switches.cc", | 37 "display_switches.cc", |
| 38 "display_switches.h", | 38 "display_switches.h", |
| 39 ] | 39 ] |
| 40 | 40 |
| 41 defines = [ "DISPLAY_IMPLEMENTATION" ] | 41 defines = [ "DISPLAY_IMPLEMENTATION" ] |
| 42 | 42 |
| 43 deps = [ | 43 deps = [ |
| 44 "//base", | 44 "//base", |
| 45 "//ui/display/types", |
| 45 "//ui/display/util", | 46 "//ui/display/util", |
| 46 "//ui/gfx", | 47 "//ui/gfx", |
| 47 "//ui/gfx/geometry", | 48 "//ui/gfx/geometry", |
| 48 ] | 49 ] |
| 49 | 50 |
| 50 if (use_x11) { | 51 if (use_x11) { |
| 52 sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ] |
| 51 configs += [ | 53 configs += [ |
| 52 "//build/config/linux:x11", | 54 "//build/config/linux:x11", |
| 53 "//build/config/linux:xext", | 55 "//build/config/linux:xext", |
| 54 "//build/config/linux:xi", | 56 "//build/config/linux:xi", |
| 55 "//build/config/linux:xrandr", | 57 "//build/config/linux:xrandr", |
| 56 ] | 58 ] |
| 57 deps += [ "//ui/events/platform" ] | 59 deps += [ "//ui/events/platform" ] |
| 58 if (is_chromeos) { | |
| 59 sources -= [ "chromeos/ozone/display_configurator_ozone.cc" ] | |
| 60 } | |
| 61 } | 60 } |
| 62 | 61 |
| 63 if (is_chromeos) { | 62 deps += [] |
| 64 deps += [ "//ui/display/types" ] | 63 if (use_x11) { |
| 65 if (use_x11) { | 64 deps += [ "//ui/gfx/x" ] |
| 66 deps += [ "//ui/gfx/x" ] | |
| 67 } | |
| 68 } | 65 } |
| 69 | 66 |
| 70 if (use_ozone) { | 67 if (use_ozone) { |
| 71 deps += [ "//ui/ozone" ] | 68 deps += [ "//ui/ozone" ] |
| 72 if (is_chromeos) { | 69 sources -= [ |
| 73 sources -= [ | 70 "chromeos/x11/display_configurator_x11.cc", |
| 74 "chromeos/x11/display_configurator_x11.cc", | 71 "chromeos/x11/display_mode_x11.cc", |
| 75 "chromeos/x11/display_mode_x11.cc", | 72 "chromeos/x11/display_mode_x11.h", |
| 76 "chromeos/x11/display_mode_x11.h", | 73 "chromeos/x11/display_snapshot_x11.cc", |
| 77 "chromeos/x11/display_snapshot_x11.cc", | 74 "chromeos/x11/display_snapshot_x11.h", |
| 78 "chromeos/x11/display_snapshot_x11.h", | 75 "chromeos/x11/display_util_x11.cc", |
| 79 "chromeos/x11/display_util_x11.cc", | 76 "chromeos/x11/display_util_x11.h", |
| 80 "chromeos/x11/display_util_x11.h", | 77 "chromeos/x11/native_display_delegate_x11.cc", |
| 81 "chromeos/x11/native_display_delegate_x11.cc", | 78 "chromeos/x11/native_display_delegate_x11.h", |
| 82 "chromeos/x11/native_display_delegate_x11.h", | 79 "chromeos/x11/native_display_event_dispatcher_x11.cc", |
| 83 "chromeos/x11/native_display_event_dispatcher_x11.cc", | 80 "chromeos/x11/native_display_event_dispatcher_x11.h", |
| 84 "chromeos/x11/native_display_event_dispatcher_x11.h", | 81 ] |
| 85 ] | |
| 86 } | |
| 87 } | 82 } |
| 88 } | 83 } |
| 89 | 84 |
| 90 component("test_util") { | 85 component("test_util") { |
| 91 output_name = "display_test_util" | 86 output_name = "display_test_util" |
| 92 sources = [ | 87 sources = [ |
| 93 "chromeos/test/test_display_snapshot.cc", | 88 "chromeos/test/test_display_snapshot.cc", |
| 94 "chromeos/test/test_display_snapshot.h", | 89 "chromeos/test/test_display_snapshot.h", |
| 95 ] | 90 ] |
| 96 | 91 |
| 97 defines = [ "DISPLAY_IMPLEMENTATION" ] | 92 defines = [ "DISPLAY_IMPLEMENTATION" ] |
| 98 | 93 |
| 99 public_deps = [ | 94 public_deps = [ |
| 100 ":display", | 95 ":display", |
| 101 ] | 96 ] |
| 102 deps = [ | 97 deps = [ |
| 103 "//base", | 98 "//base", |
| 99 "//ui/display/types", |
| 104 "//ui/gfx", | 100 "//ui/gfx", |
| 105 "//ui/gfx/geometry", | 101 "//ui/gfx/geometry", |
| 106 ] | 102 ] |
| 107 | |
| 108 if (is_chromeos) { | |
| 109 deps += [ "//ui/display/types" ] | |
| 110 } | |
| 111 } | 103 } |
| 112 | 104 |
| 113 source_set("test_support") { | 105 source_set("test_support") { |
| 114 testonly = true | 106 testonly = true |
| 115 sources = [ | 107 sources = [ |
| 116 "chromeos/test/action_logger.cc", | 108 "chromeos/test/action_logger.cc", |
| 117 "chromeos/test/action_logger.h", | 109 "chromeos/test/action_logger.h", |
| 118 "chromeos/test/action_logger_util.cc", | 110 "chromeos/test/action_logger_util.cc", |
| 119 "chromeos/test/action_logger_util.h", | 111 "chromeos/test/action_logger_util.h", |
| 120 "chromeos/test/test_display_layout_manager.cc", | 112 "chromeos/test/test_display_layout_manager.cc", |
| (...skipping 47 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 168 ] | 160 ] |
| 169 } | 161 } |
| 170 | 162 |
| 171 if (use_ozone && is_chromeos) { | 163 if (use_ozone && is_chromeos) { |
| 172 sources -= [ | 164 sources -= [ |
| 173 "chromeos/x11/display_util_x11_unittest.cc", | 165 "chromeos/x11/display_util_x11_unittest.cc", |
| 174 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc", | 166 "chromeos/x11/native_display_event_dispatcher_x11_unittest.cc", |
| 175 ] | 167 ] |
| 176 } | 168 } |
| 177 } | 169 } |
| OLD | NEW |