Skip to content

Commit 52876a0

Browse files
auto-submit[bot]auto-submit[bot]
andauthored
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 flutter/flutter#163487 <!-- end_revert_body --> Co-authored-by: auto-submit[bot] <flutter-engprod-team@google.com>
1 parent af15a1e commit 52876a0

6 files changed

Lines changed: 2 additions & 12 deletions

File tree

DEPS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -637,7 +637,7 @@ deps = {
637637
],
638638
'dep_type': 'cipd',
639639
},
640-
'third_party/ninja': {
640+
'engine/src/flutter/third_party/ninja': {
641641
'packages': [
642642
{
643643
'package': 'infra/3pp/tools/ninja/${{platform}}',

buildtools/README.md

Lines changed: 0 additions & 1 deletion
This file was deleted.

dev/bots/analyze.dart

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1632,7 +1632,6 @@ Future<void> verifyRepositoryLinks(String workingDirectory) async {
16321632
'glfw/glfw',
16331633
'GoogleCloudPlatform/artifact-registry-maven-tools',
16341634
'material-components/material-components-android', // TODO(guidezpl): remove when https://github.com/material-components/material-components-android/issues/4144 is closed
1635-
'ninja-build/ninja',
16361635
'torvalds/linux',
16371636
'tpn/winsdk-10',
16381637
};

engine/src/flutter/ci/licenses_golden/excluded_files

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2295,6 +2295,7 @@
22952295
../../../flutter/third_party/libwebp/swig
22962296
../../../flutter/third_party/libwebp/tests
22972297
../../../flutter/third_party/libwebp/webp_js
2298+
../../../flutter/third_party/ninja
22982299
../../../flutter/third_party/ocmock
22992300
../../../flutter/third_party/perfetto/.clang-format
23002301
../../../flutter/third_party/perfetto/.clang-tidy
File renamed without changes.

third_party/.gitignore

Lines changed: 0 additions & 9 deletions
This file was deleted.

0 commit comments

Comments
 (0)