From 963e01c76ce100051a143880fcf65b04f8e1ac4c Mon Sep 17 00:00:00 2001 From: Junji Watanabe Date: Fri, 3 Feb 2023 03:42:42 +0000 Subject: [PATCH] Remove ninja entries from cipd_manifest.txt CIPD Ninja is installed by DEPS instead. Bug: 1340825 Change-Id: I69106fe9b06154bac7db9278e905efb99e90974c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/4220972 Reviewed-by: Philipp Wollermann Commit-Queue: Philipp Wollermann Auto-Submit: Junji Watanabe Commit-Queue: Junji Watanabe --- cipd_manifest.txt | 4 ---- cipd_manifest.versions | 16 ---------------- 2 files changed, 20 deletions(-) diff --git a/cipd_manifest.txt b/cipd_manifest.txt index bd77122c8..ab3f14f70 100644 --- a/cipd_manifest.txt +++ b/cipd_manifest.txt @@ -66,10 +66,6 @@ chromiumos/infra/crosjobs/${platform=linux-amd64} git_revision:ed616d595eb7241d3 infra/goma/client/${os=linux,windows}-${arch=amd64} git_revision:f24b71a9d773a5c6ab675af7a48662d06bed57f9 infra/goma/client/${os=mac}-${arch} git_revision:f24b71a9d773a5c6ab675af7a48662d06bed57f9 -# ninja -infra/3pp/tools/ninja/${os=linux,windows}-${arch=amd64} version:2@1.8.2.chromium.3 -infra/3pp/tools/ninja/${os=mac}-${arch} version:2@1.8.2.chromium.3 - # dirmd, a tool to work with DIR_METADATA files infra/tools/dirmd/${platform} git_revision:05bd91859e2bfe4263bd21ed75d975af8d5144a0 diff --git a/cipd_manifest.versions b/cipd_manifest.versions index bb974076b..f6178d034 100644 --- a/cipd_manifest.versions +++ b/cipd_manifest.versions @@ -5,22 +5,6 @@ chromiumos/infra/crosjobs/linux-amd64 git_revision:ed616d595eb7241d39d34907050d2949121d6ae8 _vAeU0Q9lAxn933K8vDhwGK40zKVvV-yXGpIy43ATXAC -infra/3pp/tools/ninja/linux-amd64 - version:2@1.8.2.chromium.3 - PUvdixKxFO_KVk9d6WFpXLVDMM0MHv86jyyySTMQ7KIC - -infra/3pp/tools/ninja/mac-amd64 - version:2@1.8.2.chromium.3 - w-R-1UrTQJ2UPgSjcqXMayjE6pf76XpXE434rOY1EC8C - -infra/3pp/tools/ninja/mac-arm64 - version:2@1.8.2.chromium.3 - nVO-Kzyky9nfG4pRb3Qo7KdxyoEXjdwuOhVwy-h0rbMC - -infra/3pp/tools/ninja/windows-amd64 - version:2@1.8.2.chromium.3 - HLdWFKyFMpFQO3VFSps1gevQGwY95hEBUFblIfDux5QC - infra/chromeperf/pinpoint/linux-386 git_revision:e74dd94f00ae6be0c8272e438cd264e9817ad585 voocpVgmOy76SPLIKKwDw2ej54o11Fcc07-DWd5VovIC