From 52876a0b25670d8a3bc5fa05a38e4023441f6b88 Mon Sep 17 00:00:00 2001
From: "auto-submit[bot]" <98614782+auto-submit[bot]@users.noreply.github.com>
Date: Wed, 26 Feb 2025 17:53:36 +0000
Subject: [PATCH] Reverts "Add a buildtools directory and move
 third_party/ninja to the project root in order to match the expectations of
 depot_tools (#163890)" (#164209)

<!-- start_original_pr_link -->
Reverts: flutter/flutter#163890
<!-- end_original_pr_link -->
<!-- start_initiating_author -->
Initiated by: jason-simmons
<!-- end_initiating_author -->
<!-- start_revert_reason -->
Reason for reverting: et and related packages in
https://github.com/flutter/flutter/tree/master/engine/src/flutter/tools
need to be updated for the new Ninja path
<!-- end_revert_reason -->
<!-- start_original_pr_author -->
Original PR Author: jason-simmons
<!-- end_original_pr_author -->

<!-- start_reviewers -->
Reviewed By: {matanlurey, jtmcdole}
<!-- end_reviewers -->

<!-- start_revert_body -->
This change reverts the following previous change:
The depot_tools Ninja wrapper looks for Ninja at specific paths within
the tree. The use of "name": "." in the engine's .gclient file is not
expected by the depot_tools logic for locating the engine's source
directory.

This PR creates an alternative layout that is supported by depot_tools.
If the project root directory contains a "buildtools" subdirectory, then
depot_tools will look for Ninja at "third_party/ninja" within the root.

Fixes https://github.com/flutter/flutter/issues/163487
<!-- end_revert_body -->

Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com>
---
 DEPS                                                     | 2 +-
 buildtools/README.md                                     | 1 -
 dev/bots/analyze.dart                                    | 1 -
 engine/src/flutter/ci/licenses_golden/excluded_files     | 1 +
 .../src/flutter/third_party}/ninja/README.flutter        | 0
 third_party/.gitignore                                   | 9 ---------
 6 files changed, 2 insertions(+), 12 deletions(-)
 delete mode 100644 buildtools/README.md
 rename {third_party => engine/src/flutter/third_party}/ninja/README.flutter (100%)
 delete mode 100644 third_party/.gitignore

diff --git a/DEPS b/DEPS
index e5c76ed861..798ecfdb13 100644
--- a/DEPS
+++ b/DEPS
@@ -637,7 +637,7 @@ deps = {
     ],
     'dep_type': 'cipd',
   },
-  'third_party/ninja': {
+  'engine/src/flutter/third_party/ninja': {
     'packages': [
       {
         'package': 'infra/3pp/tools/ninja/${{platform}}',
diff --git a/buildtools/README.md b/buildtools/README.md
deleted file mode 100644
index 3d0b26bc8e..0000000000
--- a/buildtools/README.md
+++ /dev/null
@@ -1 +0,0 @@
-This directory is a placeholder intended to make Flutter's source tree match the expectations of [depot_tools](https://www.chromium.org/developers/how-tos/depottools/), which is used to build the Flutter engine.
diff --git a/dev/bots/analyze.dart b/dev/bots/analyze.dart
index b46863f43d..eca1f1e98c 100644
--- a/dev/bots/analyze.dart
+++ b/dev/bots/analyze.dart
@@ -1632,7 +1632,6 @@ Future<void> verifyRepositoryLinks(String workingDirectory) async {
     'glfw/glfw',
     'GoogleCloudPlatform/artifact-registry-maven-tools',
     'material-components/material-components-android', // TODO(guidezpl): remove when https://github.com/material-components/material-components-android/issues/4144 is closed
-    'ninja-build/ninja',
     'torvalds/linux',
     'tpn/winsdk-10',
   };
diff --git a/engine/src/flutter/ci/licenses_golden/excluded_files b/engine/src/flutter/ci/licenses_golden/excluded_files
index 81e2f035a8..250bb429a9 100644
--- a/engine/src/flutter/ci/licenses_golden/excluded_files
+++ b/engine/src/flutter/ci/licenses_golden/excluded_files
@@ -2295,6 +2295,7 @@
 ../../../flutter/third_party/libwebp/swig
 ../../../flutter/third_party/libwebp/tests
 ../../../flutter/third_party/libwebp/webp_js
+../../../flutter/third_party/ninja
 ../../../flutter/third_party/ocmock
 ../../../flutter/third_party/perfetto/.clang-format
 ../../../flutter/third_party/perfetto/.clang-tidy
diff --git a/third_party/ninja/README.flutter b/engine/src/flutter/third_party/ninja/README.flutter
similarity index 100%
rename from third_party/ninja/README.flutter
rename to engine/src/flutter/third_party/ninja/README.flutter
diff --git a/third_party/.gitignore b/third_party/.gitignore
deleted file mode 100644
index b528e9e24b..0000000000
--- a/third_party/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-# Ignore everything by default, as these come from gclient/DEPS.
-# We'll explicitly include the folders we want to track.
-/*
-
-# Include the .gitignore file itself.
-!.gitignore
-
-# Allow custom README.flutter files in each folder.
-**/README.flutter