From 31d9206f059fe9c5299be52870d9fad595fb543d Mon Sep 17 00:00:00 2001 From: Justin Cohen Date: Tue, 19 Oct 2021 16:12:52 -0400 Subject: [PATCH] Correct new mini_chromium locations for external. Followup to crrev.com/c/3062424 to fix Keystone build. Change-Id: I0c6a7bb236a84e2e11f4a9292f8a95bc99a99277 Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3231491 Commit-Queue: David Fang Commit-Queue: Justin Cohen Reviewed-by: Mark Mentovai --- build/crashpad_buildconfig.gni | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/build/crashpad_buildconfig.gni b/build/crashpad_buildconfig.gni index a9a8a102..e6e51e85 100644 --- a/build/crashpad_buildconfig.gni +++ b/build/crashpad_buildconfig.gni @@ -36,10 +36,7 @@ crashpad_is_standalone = crashpad_dependencies == "standalone" # This is the parent directory that contains the mini_chromium source dir. # This variable is not used when crashpad_is_in_chromium. -if (crashpad_is_external || crashpad_is_in_dart) { - # External and Dart SDK builds assume crashpad and mini_chromium are peers. - mini_chromium_source_parent = "../mini_chromium" -} else if (crashpad_is_in_fuchsia) { +if (crashpad_is_in_fuchsia) { mini_chromium_source_parent = "//third_party/crashpad/third_party/mini_chromium" } else { mini_chromium_source_parent = "../third_party/mini_chromium" @@ -50,7 +47,7 @@ _mini_chromium_source_root = "$mini_chromium_source_parent/mini_chromium" # This references the mini_chromium location for importing GN files. if (crashpad_is_external || crashpad_is_in_dart) { - mini_chromium_import_root = "../../$_mini_chromium_source_root" + mini_chromium_import_root = "../../../$_mini_chromium_source_root" } else if (crashpad_is_in_fuchsia) { mini_chromium_import_root = "//third_party/mini_chromium" } else { @@ -70,6 +67,7 @@ if (crashpad_is_in_chromium) { crashpad_is_clang = is_clang } else { import("$mini_chromium_import_root/build/compiler.gni") + import("$mini_chromium_import_root/build/platform.gni") crashpad_is_mac = mini_chromium_is_mac crashpad_is_ios = mini_chromium_is_ios