don't build remoting_crash_uploader if not needed
remoting/host/linux/installer will use either remoting_crashpad_handler or remoting_crash_uploader (via //remoting/host/crash:crash_tools) On Linux, we may not use remoting_crash_uploader as it uses old build ID (crbug.com/391748031). and we've completely moved to Crashpad. remoting/host/installer/linux/build-deb.sh removes old remoting_crash_uploader, but it caused confirm no-op error. Don't build remoting_crash_uploader if not needed. Bug: 398957315 Change-Id: I703870865916004ac353d6893f1515f17e503952 Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/6332912 Reviewed-by: Junji Watanabe <jwata@google.com> Reviewed-by: Joe Downing <joedow@chromium.org> Auto-Submit: Fumitoshi Ukai <ukai@google.com> Commit-Queue: Joe Downing <joedow@chromium.org> Cr-Commit-Position: refs/heads/main@{#1429317}
This commit is contained in:

committed by
Chromium LUCI CQ

parent
dbf9490aea
commit
7364e40aca
@ -55,13 +55,17 @@ source_set("crash_uploader_main") {
|
||||
]
|
||||
}
|
||||
|
||||
executable("remoting_crash_uploader") {
|
||||
sources = [ "crash_uploader_entry_point.cc" ]
|
||||
# For Linux we've completely moved to Crashpad,
|
||||
# so no need to build old crash uploader. crbug.com/398957315
|
||||
if (!is_linux || !enable_chromoting_crashpad) {
|
||||
executable("remoting_crash_uploader") {
|
||||
sources = [ "crash_uploader_entry_point.cc" ]
|
||||
|
||||
deps = [
|
||||
":crash_uploader_main_headers",
|
||||
"//remoting/host:remoting_core",
|
||||
]
|
||||
deps = [
|
||||
":crash_uploader_main_headers",
|
||||
"//remoting/host:remoting_core",
|
||||
]
|
||||
}
|
||||
}
|
||||
|
||||
if (is_linux && enable_chromoting_crashpad) {
|
||||
|
@ -60,10 +60,12 @@ if (enable_me2me_host) {
|
||||
}
|
||||
}
|
||||
|
||||
copy("remoting_me2me_host_copy_crash_uploader") {
|
||||
sources = [ "$root_build_dir/remoting_crash_uploader" ]
|
||||
outputs = [ "$root_build_dir/remoting/crash-uploader" ]
|
||||
deps = [ "//remoting/host/crash:remoting_crash_uploader" ]
|
||||
if (!is_linux || !enable_chromoting_crashpad) {
|
||||
copy("remoting_me2me_host_copy_crash_uploader") {
|
||||
sources = [ "$root_build_dir/remoting_crash_uploader" ]
|
||||
outputs = [ "$root_build_dir/remoting/crash-uploader" ]
|
||||
deps = [ "//remoting/host/crash:remoting_crash_uploader" ]
|
||||
}
|
||||
}
|
||||
|
||||
copy("remoting_me2me_host_copy_libremoting_core") {
|
||||
|
Reference in New Issue
Block a user