Skip to content

Commit

Permalink
Clean up the posix source files in ui/
Browse files Browse the repository at this point in the history
This is a preliminary change to remove the posix source exclusion
filter in a future commit.

Bug: 835405
Change-Id: I69e6b3ba30daafc57ab06c664f0166ba537dbc05
Reviewed-on: https://chromium-review.googlesource.com/1022315
Commit-Queue: Fabrice de Gans-Riberi <fdegans@chromium.org>
Reviewed-by: Nico Weber <thakis@chromium.org>
Cr-Commit-Position: refs/heads/master@{#552523}
  • Loading branch information
Steelskin authored and Commit Bot committed Apr 20, 2018
1 parent 437e6fb commit bd5877f
Show file tree
Hide file tree
Showing 3 changed files with 13 additions and 4 deletions.
6 changes: 5 additions & 1 deletion ui/base/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,6 @@ component("base") {
"l10n/l10n_util_collator.h",
"l10n/l10n_util_mac.h",
"l10n/l10n_util_mac.mm",
"l10n/l10n_util_posix.cc",
"l10n/l10n_util_win.cc",
"l10n/l10n_util_win.h",
"l10n/time_format.cc",
Expand Down Expand Up @@ -325,6 +324,10 @@ component("base") {
"work_area_watcher_observer.h",
]

if (is_posix) {
sources += [ "l10n/l10n_util_posix.cc" ]
}

if (!is_ios) {
sources += [
"accelerators/accelerator.cc",
Expand Down Expand Up @@ -394,6 +397,7 @@ component("base") {
if (is_fuchsia) {
sources += [
"idle/idle_fuchsia.cc",
"l10n/l10n_util_posix.cc",
"resource/resource_bundle_fuchsia.cc",
]
}
Expand Down
6 changes: 4 additions & 2 deletions ui/events/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ component("events") {
"win/keyboard_hook_win.cc",
"win/system_event_state_lookup.cc",
"win/system_event_state_lookup.h",
"x/keyboard_hook_posix.cc",
]

defines = [ "EVENTS_IMPLEMENTATION" ]
Expand All @@ -179,7 +178,10 @@ component("events") {
]

if (use_x11) {
sources += [ "x/events_x.cc" ]
sources += [
"x/events_x.cc",
"x/keyboard_hook_posix.cc",
]
configs += [ "//build/config/linux:x11" ]
deps += [
"//ui/events/devices",
Expand Down
5 changes: 4 additions & 1 deletion ui/surface/BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ jumbo_component("surface") {
"surface_export.h",
"transport_dib.cc",
"transport_dib.h",
"transport_dib_posix.cc",
"transport_dib_win.cc",
]

Expand All @@ -26,4 +25,8 @@ jumbo_component("surface") {
"//ui/gfx/geometry",
"//ui/gl",
]

if (is_posix) {
sources += [ "transport_dib_posix.cc" ]
}
}

0 comments on commit bd5877f

Please sign in to comment.