From 343aa69084e5462c0f790e2490991d270233cfd7 Mon Sep 17 00:00:00 2001 From: Thomas Gales Date: Fri, 4 Aug 2023 20:09:44 +0000 Subject: [PATCH] Revert "[fuchsia][mac] Fix build errors" 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 > Commit-Queue: Thomas Gales Change-Id: Id3dc42484fbd87e242756c8d2889d2e404370ac7 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4753637 Commit-Queue: Thomas Gales Reviewed-by: Joshua Peraza --- util/BUILD.gn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/util/BUILD.gn b/util/BUILD.gn index 15bebdec..7e06fcda 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn @@ -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") }