Commit 25c86c83 authored by Maksim Sisov's avatar Maksim Sisov Committed by Commit Bot

Ozone/Linux: conditionally enable remoting targets.

The effort to have a single Linux config that can either use
ozone/x11/wayland or non-ozone/x11 path revealed one problem
with the "remoting" component. Basically, what we are doing
is that we make use_x11 == use_ozone == is_linux. That means
that we have 1) just one Linux config 2) user can switch
to OzonePlatform by passing --enable-features=UseOzonePlatform.

However, the condition to enable remoting is based on old assumption
that is_linux == use_x11 && use_ozone != use_x11. Given that,
the remoting targets are disabled and linux-rel bot starts to complain.

Thus, as an initial remoting support on Ozone/Linux, make these
targets compiled for is_linux regardless if it has ozone set
or not.

Further investigation and verification of the feature is required
to close the bug.

Bug: 1112776
Change-Id: I7d8c523c96d5f430b8f9891a4568894bd523f3d0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2362667Reviewed-by: default avatarThomas Anderson <thomasanderson@chromium.org>
Commit-Queue: Maksim Sisov (GMT+3) <msisov@igalia.com>
Cr-Commit-Position: refs/heads/master@{#799259}
parent 84e5f72e
......@@ -831,7 +831,12 @@ group("gn_all") {
deps += [ "//third_party/opencv:opencv_emd_fuzzer" ]
}
if ((is_linux || is_chromeos || is_win) && enable_remoting && !use_ozone) {
# TODO(https://crbug.com/1112776): ensure remoting is functional on Linux builds with
# ozone. We also need to figure out what to do with remoting_host that is set for
# use_x11 && is_linux. See remoting/remoting_options.gni. For now, just allow to
# enable remoting for is_linux && use_x11 && use_ozone.
if ((is_linux || is_chromeos || is_win) && enable_remoting &&
(use_x11 || !use_ozone)) {
# This group is used for network annotation check test.
group("shipped_binaries") {
deps = [
......
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