commit 46a94a85ab59839388351d9b4ff179edfcf8ac27
author David Fang <fangism@google.com> Tue Aug 24 19:47:39 2021 +0000
committer Copybara-Service <copybara-worker@google.com> Thu Aug 26 16:14:51 2021 -0700
tree 15c6a4d40abebbd166aa530a34892af7b8684388
parent 5687b22330db6fc02edcab3ffee413b339550a80

[fuchsia][reland] new location of mini_chromium

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

Change-Id: Ie9dbbdcd5ca1da51828fd524e581d5c0856144ca
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>
GitOrigin-RevId: 29e30d04c8010fba911aef9ac37734ed52f9e55d

build/crashpad_buildconfig.gni

diff --git a/build/crashpad_buildconfig.gni b/build/crashpad_buildconfig.gni
index 7244afa..a9a8a10 100644
--- a/build/crashpad_buildconfig.gni
+++ b/build/crashpad_buildconfig.gni
@@ -40,7 +40,7 @@
   # 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 @@
 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
 }

third_party/mini_chromium/BUILD.gn

diff --git a/third_party/mini_chromium/BUILD.gn b/third_party/mini_chromium/BUILD.gn
index 2666111..ccd70c3 100644
--- a/third_party/mini_chromium/BUILD.gn
+++ b/third_party/mini_chromium/BUILD.gn
@@ -20,7 +20,7 @@
   } 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("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("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) {