From a41e599f3328ba23dac863f35fb5605d76e03dbb Mon Sep 17 00:00:00 2001 From: Jay Zhuang Date: Tue, 3 Jan 2023 18:01:03 +0800 Subject: [PATCH] [fuchsia] Update crashpad location ... as we move crashpad from //third_party/crashpad to //third_party/crashpad/src Change-Id: I081520ad44334cc83397234e5d16535d0db4806d Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4132465 Reviewed-by: Francois Rousseau Commit-Queue: Jay Zhuang --- build/crashpad_buildconfig.gni | 2 +- third_party/lss/lss.h | 2 +- util/BUILD.gn | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/build/crashpad_buildconfig.gni b/build/crashpad_buildconfig.gni index dbbc3807..eeb56dc3 100644 --- a/build/crashpad_buildconfig.gni +++ b/build/crashpad_buildconfig.gni @@ -37,7 +37,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_in_fuchsia) { - mini_chromium_source_parent = "//third_party/crashpad/third_party/mini_chromium" + mini_chromium_source_parent = "//third_party/crashpad/src/third_party/mini_chromium" } else { mini_chromium_source_parent = "../third_party/mini_chromium" } diff --git a/third_party/lss/lss.h b/third_party/lss/lss.h index ee7e661f..90cb9bcf 100644 --- a/third_party/lss/lss.h +++ b/third_party/lss/lss.h @@ -20,7 +20,7 @@ #elif defined(CRASHPAD_LSS_SOURCE_EMBEDDED) #include "third_party/lss/lss/linux_syscall_support.h" #elif defined(CRASHPAD_LSS_SOURCE_FUCHSIA) -#include "../../../../third_party/linux-syscall-support/src/linux_syscall_support.h" +#include "../../../../../third_party/linux-syscall-support/src/linux_syscall_support.h" #else #error Unknown lss source #endif diff --git a/util/BUILD.gn b/util/BUILD.gn index 351c0cdd..515b1728 100644 --- a/util/BUILD.gn +++ b/util/BUILD.gn @@ -562,7 +562,7 @@ crashpad_static_library("util") { # Include generated files starting with "util". if (crashpad_is_in_fuchsia) { - include_dirs = [ "$root_gen_dir/third_party/crashpad" ] + include_dirs = [ "$root_gen_dir/third_party/crashpad/src" ] } else { include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ] }