diff --git a/build/crashpad_buildconfig.gni b/build/crashpad_buildconfig.gni index 7244afa3..a9a8a102 100644 --- a/build/crashpad_buildconfig.gni +++ b/build/crashpad_buildconfig.gni @@ -40,7 +40,7 @@ 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) { - mini_chromium_source_parent = "../third_party/mini_chromium" + mini_chromium_source_parent = "//third_party/crashpad/third_party/mini_chromium" } else { 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) { mini_chromium_import_root = "../../$_mini_chromium_source_root" } else if (crashpad_is_in_fuchsia) { - mini_chromium_import_root = _mini_chromium_source_root + mini_chromium_import_root = "//third_party/mini_chromium" } else { mini_chromium_import_root = _mini_chromium_source_root } diff --git a/third_party/mini_chromium/BUILD.gn b/third_party/mini_chromium/BUILD.gn index 26661113..ccd70c3d 100644 --- a/third_party/mini_chromium/BUILD.gn +++ b/third_party/mini_chromium/BUILD.gn @@ -20,7 +20,7 @@ group("base") { } else if (crashpad_is_standalone) { public_deps = [ "mini_chromium/base" ] } else if (crashpad_is_in_fuchsia) { - public_deps = [ "mini_chromium/base" ] + public_deps = [ "//third_party/mini_chromium/base" ] } else if (crashpad_is_external) { public_deps = [ "../../../../mini_chromium/mini_chromium/base" ] } else if (crashpad_is_in_dart) { @@ -39,8 +39,10 @@ group("base_test_support") { group("build") { if (crashpad_is_in_chromium) { # Chromium has no build target. - } else if (crashpad_is_standalone || crashpad_is_in_fuchsia) { + } else if (crashpad_is_standalone) { public_deps = [ "mini_chromium/build" ] + } else if (crashpad_is_in_fuchsia) { + public_deps = [ "//third_party/mini_chromium/build" ] } else if (crashpad_is_external) { public_deps = [ "../../../../mini_chromium/mini_chromium/build" ] } else if (crashpad_is_in_dart) { @@ -51,8 +53,10 @@ group("build") { group("chromeos_buildflags") { if (crashpad_is_in_chromium) { 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" ] + } else if (crashpad_is_in_fuchsia) { + public_deps = [ "//third_party/mini_chromium/build:chromeos_buildflags" ] } else if (crashpad_is_external) { public_deps = [ "../../../../mini_chromium/mini_chromium/build:chromeos_buildflags" ] } else if (crashpad_is_in_dart) {