chromium/src
0
Fork 0
Code Activity

remoting: Remove remoting_use_wayland from installer

Browse Source 
Bug: chromium:1291247
Change-Id: I406101a63b9c99b6e925c54d3a2c195e45e549b5
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/4179273
Reviewed-by: Lambros Lambrou <lambroslambrou@chromium.org>
Commit-Queue: Salman Malik <salmanmalik@chromium.org>
Cr-Commit-Position: refs/heads/main@{#1094430}
This commit is contained in:
Salman
2023-01-19 13:47:31 +00:00
committed by Chromium LUCI CQ
parent 6388195e79
commit a1d61967bd
4 changed files with 3 additions and 48 deletions

10
remoting/host/installer/linux/BUILD.gn

@ -95,15 +95,7 @@ action("remoting_me2me_host_deb_installer") {
"-o",
".",
]
if (remoting_use_wayland) {
inputs += [
"//remoting/host/installer/linux/chrome-remote-desktop-wayland@.service",
]
args += [ "--remoting_use_wayland" ]
} else {
inputs +=
[ "//remoting/host/installer/linux/chrome-remote-desktop@.service" ]
}
inputs += [ "//remoting/host/installer/linux/chrome-remote-desktop@.service" ]
deps = [
"//remoting/host:remoting_core",

6
remoting/host/installer/linux/Makefile

@ -120,15 +120,9 @@ install:
"$(INSTALL_DIR)/remoting_locales/$$locale"; \
done
ifdef REMOTING_USE_WAYLAND
install -m 0644 \
"$(SRC_DIR)/remoting/host/installer/linux/chrome-remote-desktop-wayland@.service" \
"$(SYSTEMD_UNIT_DIR)/chrome-remote-desktop@.service"
else
install -m 0644 \
"$(SRC_DIR)/remoting/host/installer/linux/chrome-remote-desktop@.service" \
"$(SYSTEMD_UNIT_DIR)/chrome-remote-desktop@.service"
endif
# Mask the SysV-style init script under systemd so both don't end up enabled.
ln -s /dev/null "$(SYSTEMD_UNIT_DIR)/chrome-remote-desktop.service"

14
remoting/host/installer/linux/build_deb.py

@ -7,22 +7,12 @@ import os
import subprocess
import sys
REMOTING_USE_WAYLAND_OPT = "--remoting_use_wayland"
def main():
this_dir = os.path.dirname(os.path.abspath(__file__))
build_deb_script = os.path.join(this_dir, 'build-deb.sh')
if (REMOTING_USE_WAYLAND_OPT in sys.argv):
proc_env = os.environ.copy()
proc_env["REMOTING_USE_WAYLAND"] = "1"
args = sys.argv[1:]
args.remove(REMOTING_USE_WAYLAND_OPT)
proc = subprocess.Popen([build_deb_script] + args, stdout=subprocess.PIPE,
env=proc_env)
else:
proc = subprocess.Popen([build_deb_script] + sys.argv[1:],
stdout=subprocess.PIPE)
proc = subprocess.Popen([build_deb_script] + sys.argv[1:],
stdout=subprocess.PIPE)
out, _ = proc.communicate()
sys.stdout.write(out.decode('utf8').strip())
return proc.returncode

21
remoting/host/installer/linux/chrome-remote-desktop-wayland@.service

@ -1,21 +0,0 @@
[Unit]
Description=Chrome Remote Desktop instance for %I
After=network.target
[Service]
Type=simple
User=%I
Environment=XDG_SESSION_CLASS=user XDG_SESSION_TYPE=wayland
PAMName=chrome-remote-desktop
ExecStart=/opt/google/chrome-remote-desktop/chrome-remote-desktop --start --new-session --is-wayland
ExecReload=/opt/google/chrome-remote-desktop/chrome-remote-desktop --reload
ExecStop=/opt/google/chrome-remote-desktop/chrome-remote-desktop --stop
# Log output to the journal
StandardOutput=journal
# Use same fd as stdout
StandardError=inherit
# Must be kept in sync with RELAUNCH_EXIT_CODE in linux_me2me_host.py
RestartForceExitStatus=41
[Install]
WantedBy=multi-user.target