diff --git a/build/build-clang/clang-12-android.json b/build/build-clang/clang-12-android.json
index 30cf2f65fdde..aedf479e411c 100644
--- a/build/build-clang/clang-12-android.json
+++ b/build/build-clang/clang-12-android.json
@@ -6,6 +6,7 @@
     "cc": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
     "cxx": "{MOZ_FETCHES_DIR}/gcc/bin/g++",
     "as": "{MOZ_FETCHES_DIR}/gcc/bin/gcc",
+    "wasi-compiler-rt": "{MOZ_FETCHES_DIR}/compiler-rt",
     "android_targets": {
       "armv7-linux-android": {
         "ndk_toolchain": "{MOZ_FETCHES_DIR}/android-ndk/toolchains/arm-linux-androideabi-4.9/prebuilt/linux-x86_64",
diff --git a/taskcluster/ci/toolchain/clang.yml b/taskcluster/ci/toolchain/clang.yml
index 707340ee8e10..5fcf82775ba9 100644
--- a/taskcluster/ci/toolchain/clang.yml
+++ b/taskcluster/ci/toolchain/clang.yml
@@ -407,6 +407,7 @@ linux64-clang-12-android-cross:
             - linux64-gcc-7
             - linux64-android-ndk-linux-repack
             - linux64-toolchain-sysroot
+            - wasm32-wasi-compiler-rt-12
 
 linux64-clang-12-aarch64-cross:
     description: "Clang 12 toolchain build with aarch64 runtime"