From 795f75187f6e906190b23f4601cd5c06eb29bc6c Mon Sep 17 00:00:00 2001 From: Nico Weber Date: Tue, 4 May 2021 17:03:00 +0000 Subject: [PATCH] Revert "[mac/arm] pull python2 binary in cipd bootstrap now that it exists" This reverts commit 44e954ddfbcc3919b58a2ee5839a69dafd37af01. Reason for revert: Prerequisite for https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2872006 Original change's description: > [mac/arm] pull python2 binary in cipd bootstrap now that it exists > > Bug: 1124119,1103236,1184768 > Change-Id: Ie56611586dd6f79989fba970de20846b845b08b6 > Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2870586 > Auto-Submit: Nico Weber > Commit-Queue: Dirk Pranke > Reviewed-by: Dirk Pranke Bug: 1124119 Bug: 1103236 Bug: 1184768 Change-Id: I9de566312d40d9fd109d245eab36b26d19e3b0b9 No-Presubmit: true No-Tree-Checks: true No-Try: true Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/2872007 Auto-Submit: Nico Weber Bot-Commit: Rubber Stamper Commit-Queue: Dirk Pranke Reviewed-by: Dirk Pranke --- bootstrap/manifest.txt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/bootstrap/manifest.txt b/bootstrap/manifest.txt index a2d8e8152..a80ee5f6b 100644 --- a/bootstrap/manifest.txt +++ b/bootstrap/manifest.txt @@ -17,8 +17,9 @@ $VerifiedPlatform windows-amd64 linux-amd64 mac-amd64 +# TODO(https://crbug.com/1184768): Remove `=amd64` once mac/arm64 python exists @Subdir python -infra/3pp/tools/cpython/${platform} version:2@2.7.18.chromium.32 +infra/3pp/tools/cpython/${os}-${arch=amd64} version:2@2.7.18.chromium.32 @Subdir python3 infra/3pp/tools/cpython3/${platform} version:2@3.8.9.chromium.14