Install CIPD ninja using DEPS (flutter#37375)

* Install CIPD ninja using DEPS * ignore license check for third_party/ninja * update expected licenses
joshualitt · Nov 10, 2022 · f831382 · f831382
1 parent 2f5b7ac
commit f831382
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 3 deletions.
diff --git 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
@@ -616,6 +616,15 @@ deps = {
     ],
     'dep_type': 'cipd',
   },
+  'src/flutter/third_party/ninja': {
+    'packages': [
+      {
+        'package': 'infra/3pp/tools/ninja/${{platform}}',
+        'version': 'version:[email protected]',
+      }
+    ],
+    'dep_type': 'cipd',
+  },
 
   'src/buildtools/emsdk': {
    'url': Var('skia_git') + '/external/github.com/emscripten-core/emsdk.git' + '@' + 'fc645b7626ebf86530dbd82fbece74d457e7ae07',

diff --git a/ci/licenses_golden/tool_signature b/ci/licenses_golden/tool_signature
@@ -1,2 +1,2 @@
-Signature: fd17294a410a1a503ab9aa72a0797dbe
+Signature: ae1981a94872d143d802356ab0f1a35e
 
diff --git a/third_party/ninja/README.flutter 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
diff --git 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' &&
Original file line number	Diff line number	Diff line change
		@@ -1,2 +1,2 @@
		Signature: fd17294a410a1a503ab9aa72a0797dbe
		Signature: ae1981a94872d143d802356ab0f1a35e