3party/crashpad
0
0
Fork 0
mirror of https://github.com/chromium/crashpad.git synced 2025-03-09 14:06:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

[fuchsia][reland] new location of mini_chromium

Browse Source 
This reverts commit e0785f6c3f15658f51dc31aa7557ebe25af3acb1.
This is a re-roll forward of 3676b715cf3acc4edeb61e113a1e7983573c75ca.

Change-Id: Ida493946de9a705034d7233366bb8644d60d071e
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3114093
Reviewed-by: Francois Rousseau <frousseau@google.com>
Commit-Queue: Francois Rousseau <frousseau@google.com>
This commit is contained in:
David Fang 2021-08-24 19:47:39 +00:00 committed by Crashpad LUCI CQ
parent e0785f6c3f
commit 29e30d04c8
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/crashpad_buildconfig.gni
View File

@ -40,7 +40,7 @@ if (crashpad_is_external || crashpad_is_in_dart) {
# External and Dart SDK builds assume crashpad and mini_chromium are peers. # External and Dart SDK builds assume crashpad and mini_chromium are peers.
mini_chromium_source_parent = "../mini_chromium" mini_chromium_source_parent = "../mini_chromium"
} else if (crashpad_is_in_fuchsia) { } else if (crashpad_is_in_fuchsia) {
mini_chromium_source_parent = "../third_party/mini_chromium" mini_chromium_source_parent = "//third_party/crashpad/third_party/mini_chromium"
} else { } else {
mini_chromium_source_parent = "../third_party/mini_chromium" mini_chromium_source_parent = "../third_party/mini_chromium"
} }
@ -52,7 +52,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 = _mini_chromium_source_root mini_chromium_import_root = "//third_party/mini_chromium"
} else { } else {
mini_chromium_import_root = _mini_chromium_source_root mini_chromium_import_root = _mini_chromium_source_root
} }

10
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 = [ "mini_chromium/base" ] public_deps = [ "//third_party/mini_chromium/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) {
@ -39,8 +39,10 @@ group("base_test_support") {
group("build") { group("build") {
if (crashpad_is_in_chromium) { if (crashpad_is_in_chromium) {
# Chromium has no build target. # Chromium has no build target.
} else if (crashpad_is_standalone || crashpad_is_in_fuchsia) { } else if (crashpad_is_standalone) {
public_deps = [ "mini_chromium/build" ] public_deps = [ "mini_chromium/build" ]
} else if (crashpad_is_in_fuchsia) {
public_deps = [ "//third_party/mini_chromium/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) {
@ -51,8 +53,10 @@ group("build") {
group("chromeos_buildflags") { group("chromeos_buildflags") {
if (crashpad_is_in_chromium) { if (crashpad_is_in_chromium) {
public_deps = [ "//build:chromeos_buildflags" ] public_deps = [ "//build:chromeos_buildflags" ]
} else if (crashpad_is_standalone || crashpad_is_in_fuchsia) { } 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) {
public_deps = [ "//third_party/mini_chromium/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) {