From 29e30d04c8010fba911aef9ac37734ed52f9e55d Mon Sep 17 00:00:00 2001
From: David Fang <fangism@google.com>
Date: Tue, 24 Aug 2021 19:47:39 +0000
Subject: [PATCH] [fuchsia][reland] new location of mini_chromium

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>
---
 build/crashpad_buildconfig.gni     |  4 ++--
 third_party/mini_chromium/BUILD.gn | 10 +++++++---
 2 files changed, 9 insertions(+), 5 deletions(-)

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) {