Reland "Add a buildtools directory and move third_party/ninja to the project root in order to match the expectations of depot_tools" (#164240)
Relands https://github.com/flutter/flutter/pull/163890 and updates the Ninja path used by the engine tool
This commit is contained in:
parent
0f3b092a10
commit
1d25f6953d
2
DEPS
2
DEPS
@ -637,7 +637,7 @@ deps = {
|
|||||||
],
|
],
|
||||||
'dep_type': 'cipd',
|
'dep_type': 'cipd',
|
||||||
},
|
},
|
||||||
'engine/src/flutter/third_party/ninja': {
|
'third_party/ninja': {
|
||||||
'packages': [
|
'packages': [
|
||||||
{
|
{
|
||||||
'package': 'infra/3pp/tools/ninja/${{platform}}',
|
'package': 'infra/3pp/tools/ninja/${{platform}}',
|
||||||
|
1
buildtools/README.md
Normal file
1
buildtools/README.md
Normal file
@ -0,0 +1 @@
|
|||||||
|
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,6 +1632,7 @@ 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,7 +2295,6 @@
|
|||||||
../../../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
|
||||||
|
@ -583,8 +583,7 @@ final class BuildRunner extends Runner {
|
|||||||
bool success = false;
|
bool success = false;
|
||||||
try {
|
try {
|
||||||
final String ninjaPath = p.join(
|
final String ninjaPath = p.join(
|
||||||
engineSrcDir.path,
|
engineSrcDir.parent.parent.path,
|
||||||
'flutter',
|
|
||||||
'third_party',
|
'third_party',
|
||||||
'ninja',
|
'ninja',
|
||||||
'ninja',
|
'ninja',
|
||||||
|
@ -116,7 +116,8 @@ void main() {
|
|||||||
// Check that the events for the Ninja command are correct.
|
// Check that the events for the Ninja command are correct.
|
||||||
expect(events[2] is RunnerStart, isTrue);
|
expect(events[2] is RunnerStart, isTrue);
|
||||||
expect(events[2].name, equals('$buildName: ninja'));
|
expect(events[2].name, equals('$buildName: ninja'));
|
||||||
expect(events[2].command[0], contains('ninja'));
|
final String rootPath = path.dirname(path.dirname(engine.srcDir.path));
|
||||||
|
expect(events[2].command[0], equals('$rootPath/third_party/ninja/ninja'));
|
||||||
final String configPath = '${engine.srcDir.path}/out/${targetBuild.ninja.config}';
|
final String configPath = '${engine.srcDir.path}/out/${targetBuild.ninja.config}';
|
||||||
expect(events[2].command.contains(configPath), isTrue);
|
expect(events[2].command.contains(configPath), isTrue);
|
||||||
for (final String target in targetBuild.ninja.targets) {
|
for (final String target in targetBuild.ninja.targets) {
|
||||||
|
9
third_party/.gitignore
vendored
Normal file
9
third_party/.gitignore
vendored
Normal file
@ -0,0 +1,9 @@
|
|||||||
|
# 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