| Index: ui/display/BUILD.gn
|
| diff --git a/ui/display/BUILD.gn b/ui/display/BUILD.gn
|
| index c6031d6f58f062129741c33fce14d8ac2ecc1a01..736a0538d8333e49e203aac94dbe9d9c0a3b14e5 100644
|
| --- a/ui/display/BUILD.gn
|
| +++ b/ui/display/BUILD.gn
|
| @@ -9,44 +9,49 @@ component("display") {
|
| sources = [
|
| "display.cc",
|
| "display.h",
|
| - "display_change_notifier.cc",
|
| - "display_change_notifier.h",
|
| - "display_export.h",
|
| "display_finder.cc",
|
| "display_finder.h",
|
| - "display_layout.cc",
|
| - "display_layout.h",
|
| - "display_layout_builder.cc",
|
| - "display_layout_builder.h",
|
| "display_list.cc",
|
| "display_list.h",
|
| - "display_observer.cc",
|
| - "display_observer.h",
|
| "display_switches.cc",
|
| "display_switches.h",
|
| - "fake_display_delegate.cc",
|
| - "fake_display_delegate.h",
|
| - "fake_display_snapshot.cc",
|
| - "fake_display_snapshot.h",
|
| "ios/screen_ios.mm",
|
| - "mac/screen_mac.mm",
|
| "screen.cc",
|
| "screen.h",
|
| "screen_aura.cc",
|
| "screen_base.cc",
|
| "screen_base.h",
|
| - "win/display_info.cc",
|
| - "win/display_info.h",
|
| - "win/dpi.cc",
|
| - "win/dpi.h",
|
| - "win/scaling_util.cc",
|
| - "win/scaling_util.h",
|
| - "win/screen_win.cc",
|
| - "win/screen_win.h",
|
| - "win/screen_win_display.cc",
|
| - "win/screen_win_display.h",
|
| ]
|
|
|
| + if (!is_ios) {
|
| + sources += [
|
| + "display_change_notifier.cc",
|
| + "display_change_notifier.h",
|
| + "display_export.h",
|
| + "display_layout.cc",
|
| + "display_layout.h",
|
| + "display_layout_builder.cc",
|
| + "display_layout_builder.h",
|
| + "display_observer.cc",
|
| + "display_observer.h",
|
| + "fake_display_delegate.cc",
|
| + "fake_display_delegate.h",
|
| + "fake_display_snapshot.cc",
|
| + "fake_display_snapshot.h",
|
| + "mac/screen_mac.mm",
|
| + "win/display_info.cc",
|
| + "win/display_info.h",
|
| + "win/dpi.cc",
|
| + "win/dpi.h",
|
| + "win/scaling_util.cc",
|
| + "win/scaling_util.h",
|
| + "win/screen_win.cc",
|
| + "win/screen_win.h",
|
| + "win/screen_win_display.cc",
|
| + "win/screen_win_display.h",
|
| + ]
|
| + }
|
| +
|
| defines = [ "DISPLAY_IMPLEMENTATION" ]
|
|
|
| public_deps = [
|
| @@ -132,9 +137,7 @@ static_library("test_support") {
|
| test("display_unittests") {
|
| sources = [
|
| "display_change_notifier_unittest.cc",
|
| - "display_list_unittest.cc",
|
| "display_unittest.cc",
|
| - "fake_display_snapshot_unittests.cc",
|
| "manager/chromeos/apply_content_protection_task_unittest.cc",
|
| "manager/chromeos/configure_displays_task_unittest.cc",
|
| "manager/chromeos/display_change_observer_unittest.cc",
|
| @@ -142,10 +145,6 @@ test("display_unittests") {
|
| "manager/chromeos/query_content_protection_task_unittest.cc",
|
| "manager/chromeos/touchscreen_util_unittest.cc",
|
| "manager/chromeos/update_display_configuration_task_unittest.cc",
|
| - "manager/display_layout_builder_unittest.cc",
|
| - "manager/display_layout_unittest.cc",
|
| - "manager/display_manager_utilities_unittest.cc",
|
| - "manager/managed_display_info_unittest.cc",
|
| "screen_unittest.cc",
|
| "util/display_util_unittest.cc",
|
| "util/edid_parser_unittest.cc",
|
| @@ -170,9 +169,20 @@ test("display_unittests") {
|
| "//ui/gfx/geometry",
|
| ]
|
|
|
| - if (is_android) {
|
| - # Do not run display_change_notifier_unittest.cc on Android because it
|
| - # does not compile display_observer.cc
|
| + if (!is_ios) {
|
| + sources += [
|
| + "display_list_unittest.cc",
|
| + "fake_display_snapshot_unittests.cc",
|
| + "manager/display_layout_builder_unittest.cc",
|
| + "manager/display_layout_unittest.cc",
|
| + "manager/display_manager_utilities_unittest.cc",
|
| + "manager/managed_display_info_unittest.cc",
|
| + ]
|
| + }
|
| +
|
| + if (is_android || is_ios) {
|
| + # Do not run display_change_notifier_unittest.cc on Android/iOS because
|
| + # they do not compile display_observer.cc
|
| sources -= [ "display_change_notifier_unittest.cc" ]
|
| }
|
|
|
|
|