Bug 1765677 - Upgrade the version of cargo used for the vendoring but not for cargo-apk when building wrench. r=firefox-build-system-reviewers,andi

Differential Revision: https://phabricator.services.mozilla.com/D144239

taskcluster/ci/toolchain/misc.yml

@@ -175,11 +175,17 @@ wrench-deps:
             - 'gfx/wr/Cargo.lock'
             - 'gfx/wr/ci-scripts/install-meson.sh'
         toolchain-artifact: public/build/wrench-deps.tar.zst
+    dependencies:
+        linux64-rust-1.47: toolchain-linux64-rust-1.47
     fetches:
         fetch:
             - android-rs-glue
+        linux64-rust-1.47:
+            - artifact: rustc.tar.zst
+              extract: true
+              dest: rustc-1.47
         toolchain:
-            - linux64-rust-1.47  # whatever m-c is built with
+            - linux64-rust  # whatever m-c is built with
 
 linux64-liblowercase:
     description: "liblowercase"

taskcluster/scripts/misc/wrench-deps-vendoring.sh

@@ -19,7 +19,9 @@ mkdir wrench-deps/cargo-apk
 # Until there's a version of cargo-apk published on crates.io that has
 # https://github.com/rust-windowing/android-rs-glue/pull/223, we need to use
 # an unpublished version.
-cargo install --path $MOZ_FETCHES_DIR/android-rs-glue/cargo-apk --root wrench-deps/cargo-apk cargo-apk
+# That version of cargo-apk needs to be built with an older version of rust.
+# See bug 1722702 comment 4.
+PATH=$MOZ_FETCHES_DIR/rustc-1.47/rustc/bin:$PATH cargo install --path $MOZ_FETCHES_DIR/android-rs-glue/cargo-apk --root wrench-deps/cargo-apk cargo-apk
 
 ci-scripts/install-meson.sh
 mv meson wrench-deps/meson