3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2024-12-26 23:01:05 +08:00
Code Issues Projects Releases Wiki Activity

Revert "[fuchsia][mac] Fix build errors"

Browse Source 
This reverts commit ca6d64d0ae4905ad7033adab0a28273a0741ee5c.

Reason for revert: The changes did not actually fix the problem once combined with the latest changes from mini_chromium.

Original change's description:
> [fuchsia][mac] Fix build errors
>
> A recent CL [1] broke Fuchsia's Crashpad roller due to duplicate build
> argument declarations. This CL ensures that sysroot.gni is only imported once.
>
> [1] https://chromium-review.googlesource.com/c/chromium/mini_chromium/+/4651973
>
> Fixed: fuchsia:131454
> Change-Id: Idcf6ac65cdffee2c9a9551559a8aab0063044428
> Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4743381
> Reviewed-by: Joshua Peraza <jperaza@chromium.org>
> Commit-Queue: Thomas Gales <tgales@google.com>

Change-Id: Id3dc42484fbd87e242756c8d2889d2e404370ac7
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4753637
Commit-Queue: Thomas Gales <tgales@google.com>
Reviewed-by: Joshua Peraza <jperaza@chromium.org>
This commit is contained in:
Thomas Gales 2023-08-04 20:09:44 +00:00 committed by Crashpad LUCI CQ
parent 419f995aab
commit 343aa69084
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
util/BUILD.gn
View File

@ -20,9 +20,9 @@ if (crashpad_is_in_chromium) {
}
if (crashpad_is_apple) {
if (crashpad_is_in_chromium) {
if (crashpad_is_in_chromium || crashpad_is_in_fuchsia) {
import("//build/config/sysroot.gni")
} else if (!crashpad_is_in_fuchsia) {
} else {
import("$mini_chromium_import_root/build/sysroot.gni")
}