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>
This commit is contained in:
parent
af15a1eb76
commit
52876a0b25
2
DEPS
2
DEPS
@ -637,7 +637,7 @@ deps = {
|
|||||||
],
|
],
|
||||||
'dep_type': 'cipd',
|
'dep_type': 'cipd',
|
||||||
},
|
},
|
||||||
'third_party/ninja': {
|
'engine/src/flutter/third_party/ninja': {
|
||||||
'packages': [
|
'packages': [
|
||||||
{
|
{
|
||||||
'package': 'infra/3pp/tools/ninja/${{platform}}',
|
'package': 'infra/3pp/tools/ninja/${{platform}}',
|
||||||
|
@ -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.
|
|
@ -1632,7 +1632,6 @@ Future<void> verifyRepositoryLinks(String workingDirectory) async {
|
|||||||
'glfw/glfw',
|
'glfw/glfw',
|
||||||
'GoogleCloudPlatform/artifact-registry-maven-tools',
|
'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
|
'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',
|
'torvalds/linux',
|
||||||
'tpn/winsdk-10',
|
'tpn/winsdk-10',
|
||||||
};
|
};
|
||||||
|
@ -2295,6 +2295,7 @@
|
|||||||
../../../flutter/third_party/libwebp/swig
|
../../../flutter/third_party/libwebp/swig
|
||||||
../../../flutter/third_party/libwebp/tests
|
../../../flutter/third_party/libwebp/tests
|
||||||
../../../flutter/third_party/libwebp/webp_js
|
../../../flutter/third_party/libwebp/webp_js
|
||||||
|
../../../flutter/third_party/ninja
|
||||||
../../../flutter/third_party/ocmock
|
../../../flutter/third_party/ocmock
|
||||||
../../../flutter/third_party/perfetto/.clang-format
|
../../../flutter/third_party/perfetto/.clang-format
|
||||||
../../../flutter/third_party/perfetto/.clang-tidy
|
../../../flutter/third_party/perfetto/.clang-tidy
|
||||||
|
9
third_party/.gitignore
vendored
9
third_party/.gitignore
vendored
@ -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
|
|
Loading…
x
Reference in New Issue
Block a user