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

[fuchsia] Import buildconfig from fuchsia

Browse Source 
... when build is targeting Fuchsia

Change-Id: I03fab9368bd5e8687899a2efeb51736707bce81e
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/4137733
Commit-Queue: Jay Zhuang <jayzhuang@google.com>
Reviewed-by: Francois Rousseau <frousseau@google.com>
This commit is contained in:
Jay Zhuang 2023-01-05 19:30:37 +08:00 committed by Crashpad LUCI CQ
parent a0b4e88a9f
commit 43eac93aef
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
build/crashpad_buildconfig.gni
View File

@ -37,7 +37,9 @@ crashpad_is_standalone = crashpad_dependencies == "standalone"
# This is the parent directory that contains the mini_chromium source dir. # This is the parent directory that contains the mini_chromium source dir.
# This variable is not used when crashpad_is_in_chromium. # This variable is not used when crashpad_is_in_chromium.
if (crashpad_is_in_fuchsia) { if (crashpad_is_in_fuchsia) {
mini_chromium_source_parent = "//third_party/crashpad/src/third_party/mini_chromium" import("//third_party/crashpad/fuchsia_buildconfig.gni")
mini_chromium_source_parent =
fuchsia_crashpad_root + "/third_party/mini_chromium"
} else { } else {
mini_chromium_source_parent = "../third_party/mini_chromium" mini_chromium_source_parent = "../third_party/mini_chromium"
} }
@ -49,7 +51,7 @@ _mini_chromium_source_root = "$mini_chromium_source_parent/mini_chromium"
if (crashpad_is_external || crashpad_is_in_dart) { 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) { } else if (crashpad_is_in_fuchsia) {
mini_chromium_import_root = "//third_party/mini_chromium/src" mini_chromium_import_root = fuchsia_mini_chromium_root
} else { } else {
mini_chromium_import_root = _mini_chromium_source_root mini_chromium_import_root = _mini_chromium_source_root
} }

7
third_party/mini_chromium/BUILD.gn vendored
View File

@ -20,7 +20,7 @@ group("base") {
} else if (crashpad_is_standalone) { } else if (crashpad_is_standalone) {
public_deps = [ "mini_chromium/base" ] public_deps = [ "mini_chromium/base" ]
} else if (crashpad_is_in_fuchsia) { } else if (crashpad_is_in_fuchsia) {
public_deps = [ "//third_party/mini_chromium/src/base" ] public_deps = [ mini_chromium_import_root + "/base" ]
} else if (crashpad_is_external) { } else if (crashpad_is_external) {
public_deps = [ "../../../../mini_chromium/mini_chromium/base" ] public_deps = [ "../../../../mini_chromium/mini_chromium/base" ]
} else if (crashpad_is_in_dart) { } else if (crashpad_is_in_dart) {
@ -42,7 +42,7 @@ group("build") {
} else if (crashpad_is_standalone) { } else if (crashpad_is_standalone) {
public_deps = [ "mini_chromium/build" ] public_deps = [ "mini_chromium/build" ]
} else if (crashpad_is_in_fuchsia) { } else if (crashpad_is_in_fuchsia) {
public_deps = [ "//third_party/mini_chromium/src/build" ] public_deps = [ mini_chromium_import_root + "/build" ]
} else if (crashpad_is_external) { } else if (crashpad_is_external) {
public_deps = [ "../../../../mini_chromium/mini_chromium/build" ] public_deps = [ "../../../../mini_chromium/mini_chromium/build" ]
} else if (crashpad_is_in_dart) { } else if (crashpad_is_in_dart) {
@ -56,11 +56,10 @@ group("chromeos_buildflags") {
} else if (crashpad_is_standalone) { } else if (crashpad_is_standalone) {
public_deps = [ "mini_chromium/build:chromeos_buildflags" ] public_deps = [ "mini_chromium/build:chromeos_buildflags" ]
} else if (crashpad_is_in_fuchsia) { } else if (crashpad_is_in_fuchsia) {
public_deps = [ "//third_party/mini_chromium/src/build:chromeos_buildflags" ] public_deps = [ mini_chromium_import_root + "/build:chromeos_buildflags" ]
} else if (crashpad_is_external) { } else if (crashpad_is_external) {
public_deps = [ "../../../../mini_chromium/mini_chromium/build:chromeos_buildflags" ] public_deps = [ "../../../../mini_chromium/mini_chromium/build:chromeos_buildflags" ]
} else if (crashpad_is_in_dart) { } else if (crashpad_is_in_dart) {
public_deps = [ "//third_party/mini_chromium/mini_chromium/build:chromeos_buildflags" ] public_deps = [ "//third_party/mini_chromium/mini_chromium/build:chromeos_buildflags" ]
} }
} }

3
util/BUILD.gn
View File

@ -562,7 +562,8 @@ crashpad_static_library("util") {
# Include generated files starting with "util". # Include generated files starting with "util".
if (crashpad_is_in_fuchsia) { if (crashpad_is_in_fuchsia) {
include_dirs = [ "$root_gen_dir/third_party/crashpad/src" ] include_dirs =
[ "$root_gen_dir/" + rebase_path(fuchsia_crashpad_root, "//") ]
} else { } else {
include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ] include_dirs = [ "$root_gen_dir/third_party/crashpad/crashpad" ]
} }