Commit 22d05ff5 authored by Sylvain Defresne's avatar Sylvain Defresne Committed by Commit Bot

Convert //ui to not depend on set_sources_assignment_filter()

set_sources_assignment_filter() is considered as a mis-feature
of gn (as it makes it difficult to reason about the BUILD.gn
files individually).

Convert BUILD.gn files below //ui to instead use conditional
to include source files only on the platformn where they are
used.

The conversion was done by using a modified version of gn that
display all files filtered by set_sources_assignment_filter()
and updating the BUILD.gn files manually to explicitly add the
source files only on the platform that used them.

This CL was uploaded by git cl split.

Bug: 1018739
Change-Id: Ibdc5739609f3507fe28753b7603d375f735b20a1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1929821Reviewed-by: default avatarAhmed Fakhry <afakhry@chromium.org>
Commit-Queue: Sylvain Defresne <sdefresne@chromium.org>
Cr-Commit-Position: refs/heads/master@{#718586}
parent 404f2874
...@@ -7,6 +7,12 @@ import("//build/config/ui.gni") ...@@ -7,6 +7,12 @@ import("//build/config/ui.gni")
import("//testing/test.gni") import("//testing/test.gni")
import("//ui/display/display.gni") import("//ui/display/display.gni")
# Reset sources_assignment_filter for the BUILD.gn file to prevent
# regression during the migration of Chromium away from the feature.
# See build/no_sources_assignment_filter.md for more information.
# TODO(crbug.com/1018739): remove this when migration is done.
set_sources_assignment_filter([])
jumbo_component("display") { jumbo_component("display") {
sources = [ sources = [
"display.cc", "display.cc",
...@@ -28,18 +34,28 @@ jumbo_component("display") { ...@@ -28,18 +34,28 @@ jumbo_component("display") {
"display_observer.h", "display_observer.h",
"display_switches.cc", "display_switches.cc",
"display_switches.h", "display_switches.h",
"ios/screen_ios.mm",
"mac/display_link_mac.cc",
"mac/display_link_mac.h",
"mac/screen_mac.mm",
"screen.cc", "screen.cc",
"screen.h", "screen.h",
"screen_android.cc",
"screen_aura.cc",
"screen_base.cc", "screen_base.cc",
"screen_base.h", "screen_base.h",
"unified_desktop_utils.cc", "unified_desktop_utils.cc",
"unified_desktop_utils.h", "unified_desktop_utils.h",
]
if (is_android) {
sources += [ "screen_android.cc" ]
}
if (is_mac) {
sources += [
"mac/display_link_mac.cc",
"mac/display_link_mac.h",
"mac/screen_mac.mm",
]
}
if (is_win) {
sources += [
"win/color_profile_reader.cc", "win/color_profile_reader.cc",
"win/color_profile_reader.h", "win/color_profile_reader.h",
"win/display_info.cc", "win/display_info.cc",
...@@ -55,6 +71,11 @@ jumbo_component("display") { ...@@ -55,6 +71,11 @@ jumbo_component("display") {
"win/uwp_text_scale_factor.cc", "win/uwp_text_scale_factor.cc",
"win/uwp_text_scale_factor.h", "win/uwp_text_scale_factor.h",
] ]
}
if (is_ios) {
sources += [ "ios/screen_ios.mm" ]
}
defines = [ "DISPLAY_IMPLEMENTATION" ] defines = [ "DISPLAY_IMPLEMENTATION" ]
...@@ -77,8 +98,8 @@ jumbo_component("display") { ...@@ -77,8 +98,8 @@ jumbo_component("display") {
output_name = "ui_display" output_name = "ui_display"
} }
if (!use_aura) { if (use_aura) {
sources -= [ "screen_aura.cc" ] sources += [ "screen_aura.cc" ]
} }
if (is_mac) { if (is_mac) {
...@@ -120,9 +141,14 @@ jumbo_static_library("test_support") { ...@@ -120,9 +141,14 @@ jumbo_static_library("test_support") {
"test/scoped_screen_override.h", "test/scoped_screen_override.h",
"test/test_screen.cc", "test/test_screen.cc",
"test/test_screen.h", "test/test_screen.h",
]
if (is_win) {
sources += [
"win/test/screen_util_win.cc", "win/test/screen_util_win.cc",
"win/test/screen_util_win.h", "win/test/screen_util_win.h",
] ]
}
if (build_display_configuration) { if (build_display_configuration) {
sources += [ sources += [
...@@ -159,7 +185,6 @@ jumbo_static_library("test_support") { ...@@ -159,7 +185,6 @@ jumbo_static_library("test_support") {
# This test covers all testable components in display. # This test covers all testable components in display.
test("display_unittests") { test("display_unittests") {
sources = [ sources = [
"display_change_notifier_unittest.cc",
"display_layout_builder_unittest.cc", "display_layout_builder_unittest.cc",
"display_layout_unittest.cc", "display_layout_unittest.cc",
"display_list_unittest.cc", "display_list_unittest.cc",
...@@ -173,9 +198,14 @@ test("display_unittests") { ...@@ -173,9 +198,14 @@ test("display_unittests") {
"unified_desktop_utils_unittests.cc", "unified_desktop_utils_unittests.cc",
"util/display_util_unittest.cc", "util/display_util_unittest.cc",
"util/edid_parser_unittest.cc", "util/edid_parser_unittest.cc",
]
if (is_win) {
sources += [
"win/scaling_util_unittest.cc", "win/scaling_util_unittest.cc",
"win/screen_win_unittest.cc", "win/screen_win_unittest.cc",
] ]
}
if (build_display_configuration) { if (build_display_configuration) {
sources += [ sources += [
...@@ -213,10 +243,10 @@ test("display_unittests") { ...@@ -213,10 +243,10 @@ test("display_unittests") {
"//ui/gfx/geometry", "//ui/gfx/geometry",
] ]
if (is_android) { if (!is_android) {
# Do not run display_change_notifier_unittest.cc on Android because it # Do not run display_change_notifier_unittest.cc on Android because it
# does not compile display_observer.cc # does not compile display_observer.cc
sources -= [ "display_change_notifier_unittest.cc" ] sources += [ "display_change_notifier_unittest.cc" ]
} }
if (is_chromeos) { if (is_chromeos) {
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment