commit 5687b22330db6fc02edcab3ffee413b339550a80
author Mark Mentovai <mark@chromium.org> Thu Aug 19 00:03:58 2021 +0000
committer Copybara-Service <copybara-worker@google.com> Wed Aug 18 18:05:10 2021 -0700
tree 33f9bed9a7a1977b0a4906131e3dce17f9bb5fe6
parent 4b59b48b43bbc8ad40be9e70b87df5bb4502f8a1

Revert "[fuchsia] point to new location of mini_chromium"

This reverts commit 3676b715cf3acc4edeb61e113a1e7983573c75ca.

Reason for revert: By request of fangism: “We have an atomic change
problem and will need to re-roll this forward at a later date.”

Original change's description:
> [fuchsia] point to new location of mini_chromium
>
> Change-Id: I8aca564eeb3b579484048757e5da45bf0d25fc21
> Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3089504
> Reviewed-by: Mark Mentovai <mark@chromium.org>
> Commit-Queue: Mark Mentovai <mark@chromium.org>

Change-Id: I5e64e00b3586fbae238c8889f965de4dc94f54a6
Reviewed-on: https://chromium-review.googlesource.com/c/crashpad/crashpad/+/3104906
Reviewed-by: Mark Mentovai <mark@chromium.org>
Commit-Queue: Mark Mentovai <mark@chromium.org>
GitOrigin-RevId: e0785f6c3f15658f51dc31aa7557ebe25af3acb1

build/crashpad_buildconfig.gni

diff --git a/build/crashpad_buildconfig.gni b/build/crashpad_buildconfig.gni
index a9a8a10..7244afa 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/crashpad/third_party/mini_chromium"
+  mini_chromium_source_parent = "../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 = "//third_party/mini_chromium"
+  mini_chromium_import_root = _mini_chromium_source_root
 } 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 ccd70c3..2666111 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 = [ "//third_party/mini_chromium/base" ]
+    public_deps = [ "mini_chromium/base" ]
   } else if (crashpad_is_external) {
     public_deps = [ "../../../../mini_chromium/mini_chromium/base" ]
   } else if (crashpad_is_in_dart) {
@@ -39,10 +39,8 @@
 group("build") {
   if (crashpad_is_in_chromium) {
     # Chromium has no build target.
-  } else if (crashpad_is_standalone) {
+  } else if (crashpad_is_standalone || crashpad_is_in_fuchsia) {
     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) {
@@ -53,10 +51,8 @@
 group("chromeos_buildflags") {
   if (crashpad_is_in_chromium) {
     public_deps = [ "//build:chromeos_buildflags" ]
-  } else if (crashpad_is_standalone) {
+  } else if (crashpad_is_standalone || crashpad_is_in_fuchsia) {
     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) {