From 396b3eaa4143cd767740e0a08c1483e3ba074603 Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Mon, 7 Nov 2022 17:02:47 +0900 Subject: [PATCH 1/3] Install CIPD ninja using DEPS --- .gitignore | 1 + DEPS | 9 +++++++++ third_party/ninja/README.flutter | 17 +++++++++++++++++ 3 files changed, 27 insertions(+) create mode 100644 third_party/ninja/README.flutter diff --git a/.gitignore b/.gitignore index dcedccc6b2c19..c66ae6504bef8 100644 --- a/.gitignore +++ b/.gitignore @@ -29,6 +29,7 @@ docs/doxygen/ xcuserdata third_party/gn/ +third_party/ninja/ninja* # Miscellaneous *.class diff --git a/DEPS b/DEPS index a2a0406799653..095dcdd73f532 100644 --- a/DEPS +++ b/DEPS @@ -616,6 +616,15 @@ deps = { ], 'dep_type': 'cipd', }, + 'src/flutter/third_party/ninja': { + 'packages': [ + { + 'package': 'infra/3pp/tools/ninja/${{platform}}', + 'version': 'version:2@1.8.2.chromium.3', + } + ], + 'dep_type': 'cipd', + }, 'src/buildtools/emsdk': { 'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'fc645b7626ebf86530dbd82fbece74d457e7ae07', diff --git a/third_party/ninja/README.flutter b/third_party/ninja/README.flutter new file mode 100644 index 0000000000000..e79bd45f2510a --- /dev/null +++ b/third_party/ninja/README.flutter @@ -0,0 +1,17 @@ +Name: ninja +Short Name: ninja +URL: https://github.com/ninja-build/ninja +Revision: See the CIPD version in DEPS +License: Apache License 2.0 +License File: https://github.com/ninja-build/ninja/blob/master/COPYING +Security Critical: no + +Description: +Ninja is a small build system with a focus on speed, and is used to build +this project. + +The CIPD packages are built using the 3pp pipeline. +https://chromium.googlesource.com/infra/infra/+/refs/heads/main/3pp/ninja/ + +Local Modifications: +None From e2d373acf14f118922db8fc0668a7306ab1b8ff3 Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Wed, 9 Nov 2022 11:47:59 +0900 Subject: [PATCH 2/3] ignore license check for third_party/ninja --- tools/licenses/lib/main.dart | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/tools/licenses/lib/main.dart b/tools/licenses/lib/main.dart index bfc80a5d0047a..54dfc0e000fdf 100644 --- a/tools/licenses/lib/main.dart +++ b/tools/licenses/lib/main.dart @@ -1021,9 +1021,10 @@ class _RepositoryDirectory extends _RepositoryEntry implements LicenseSource { return !entry.fullName.endsWith('third_party/gn') && !entry.fullName.endsWith('third_party/gradle') && !entry.fullName.endsWith('third_party/imgui') && - !entry.fullName.endsWith('third_party/tinygltf') && - !entry.fullName.endsWith('third_party/json/docs') && !entry.fullName.endsWith('third_party/json/LICENSES') && + !entry.fullName.endsWith('third_party/json/docs') && + !entry.fullName.endsWith('third_party/ninja') && + !entry.fullName.endsWith('third_party/tinygltf') && entry.name != '.ccls-cache' && entry.name != '.cipd' && entry.name != '.git' && From 17949221dd5ced396d1fdea983ee1cfe6f145a75 Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Wed, 9 Nov 2022 15:59:13 +0900 Subject: [PATCH 3/3] update expected licenses --- ci/licenses_golden/tool_signature | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature index 211c41c05a851..e7884ad2cb98d 100644 --- a/ci/licenses_golden/tool_signature +++ b/ci/licenses_golden/tool_signature @@ -1,2 +1,2 @@ -Signature: fd17294a410a1a503ab9aa72a0797dbe +Signature: ae1981a94872d143d802356ab0f1a35e