Skip to content
This repository was archived by the owner on Feb 25, 2025. It is now read-only.

Commit f831382

Browse files
authored
Install CIPD ninja using DEPS (#37375)
* Install CIPD ninja using DEPS * ignore license check for third_party/ninja * update expected licenses
1 parent 2f5b7ac commit f831382

File tree

5 files changed

+31
-3
lines changed

5 files changed

+31
-3
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ docs/doxygen/
2929
xcuserdata
3030

3131
third_party/gn/
32+
third_party/ninja/ninja*
3233

3334
# Miscellaneous
3435
*.class

DEPS

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -616,6 +616,15 @@ deps = {
616616
],
617617
'dep_type': 'cipd',
618618
},
619+
'src/flutter/third_party/ninja': {
620+
'packages': [
621+
{
622+
'package': 'infra/3pp/tools/ninja/${{platform}}',
623+
'version': 'version:[email protected]',
624+
}
625+
],
626+
'dep_type': 'cipd',
627+
},
619628

620629
'src/buildtools/emsdk': {
621630
'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'fc645b7626ebf86530dbd82fbece74d457e7ae07',

ci/licenses_golden/tool_signature

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
Signature: fd17294a410a1a503ab9aa72a0797dbe
1+
Signature: ae1981a94872d143d802356ab0f1a35e
22

third_party/ninja/README.flutter

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
Name: ninja
2+
Short Name: ninja
3+
URL: https://github.com/ninja-build/ninja
4+
Revision: See the CIPD version in DEPS
5+
License: Apache License 2.0
6+
License File: https://github.com/ninja-build/ninja/blob/master/COPYING
7+
Security Critical: no
8+
9+
Description:
10+
Ninja is a small build system with a focus on speed, and is used to build
11+
this project.
12+
13+
The CIPD packages are built using the 3pp pipeline.
14+
https://chromium.googlesource.com/infra/infra/+/refs/heads/main/3pp/ninja/
15+
16+
Local Modifications:
17+
None

tools/licenses/lib/main.dart

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1021,9 +1021,10 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource {
10211021
return !entry.fullName.endsWith('third_party/gn') &&
10221022
!entry.fullName.endsWith('third_party/gradle') &&
10231023
!entry.fullName.endsWith('third_party/imgui') &&
1024-
!entry.fullName.endsWith('third_party/tinygltf') &&
1025-
!entry.fullName.endsWith('third_party/json/docs') &&
10261024
!entry.fullName.endsWith('third_party/json/LICENSES') &&
1025+
!entry.fullName.endsWith('third_party/json/docs') &&
1026+
!entry.fullName.endsWith('third_party/ninja') &&
1027+
!entry.fullName.endsWith('third_party/tinygltf') &&
10271028
entry.name != '.ccls-cache' &&
10281029
entry.name != '.cipd' &&
10291030
entry.name != '.git' &&

0 commit comments

Comments
 (0)