commit dad98c15ae9a21530f6ddc97c7f7a97eeaadfd95
author Rob Mohr <mohrr@google.com> Fri Jan 21 07:26:51 2022 -0800
committer CQ Bot Account <pigweed-scoped@luci-project-accounts.iam.gserviceaccount.com> Fri Jan 21 17:39:46 2022 +0000
tree cab1bff76f6e82ea70816ac0c1da917d5b1c4750
parent 5be62b801a351ca5f1e9f5b61d8605df5e885379

pw_env_setup: Move arm-gcc to new cipd file

Change-Id: Idb629d71273bc30054d188e55694aba9581e3d51
Reviewed-on: https://pigweed-review.googlesource.com/c/pigweed/pigweed/+/80783
Reviewed-by: Ewout van Bekkum <ewout@google.com>
Commit-Queue: Rob Mohr <mohrr@google.com>
Pigweed-Auto-Submit: Rob Mohr <mohrr@google.com>

pw_env_setup/compatibility.json

diff --git a/pw_env_setup/compatibility.json b/pw_env_setup/compatibility.json
index 231bef0..80938a6 100644
--- a/pw_env_setup/compatibility.json
+++ b/pw_env_setup/compatibility.json
@@ -2,6 +2,7 @@
   "root_variable": "PW_ROOT",
   "cipd_package_files": [
     "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+    "pw_env_setup/py/pw_env_setup/cipd_setup/arm.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/python.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/luci.json",

pw_env_setup/config.json

diff --git a/pw_env_setup/config.json b/pw_env_setup/config.json
index 6157dd2..d44284f 100644
--- a/pw_env_setup/config.json
+++ b/pw_env_setup/config.json
@@ -2,6 +2,7 @@
   "root_variable": "PW_ROOT",
   "cipd_package_files": [
     "pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json",
+    "pw_env_setup/py/pw_env_setup/cipd_setup/arm.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/python.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/bazel.json",
     "pw_env_setup/py/pw_env_setup/cipd_setup/luci.json"

pw_env_setup/py/pw_env_setup/cipd_setup/arm.json

diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json b/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json
index 0d4f101..1ec4fa2 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/arm.json
@@ -1,2 +1,13 @@
 [
+  {
+    "path": "pigweed/third_party/gcc-arm-none-eabi/${platform}",
+    "platforms": [
+      "linux-amd64",
+      "mac-amd64",
+      "windows-amd64"
+    ],
+    "tags": [
+      "version:10-2020-q4-major"
+    ]
+  }
 ]

pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json

diff --git a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
index ae94c5f..13de0c8 100644
--- a/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
+++ b/pw_env_setup/py/pw_env_setup/cipd_setup/pigweed.json
@@ -48,17 +48,6 @@
     ]
   },
   {
-    "path": "pigweed/third_party/gcc-arm-none-eabi/${platform}",
-    "platforms": [
-      "linux-amd64",
-      "mac-amd64",
-      "windows-amd64"
-    ],
-    "tags": [
-      "version:10-2020-q4-major"
-    ]
-  },
-  {
     "path": "infra/3pp/tools/protoc/${platform}",
     "platforms": [
       "linux-amd64",