Sync mk/ with *ring*.

mk/cargo.sh

@@ -39,10 +39,7 @@ for arg in $*; do
 done
 
 # See comments in install-build-tools.sh.
-llvm_version=10
-if [ -n "${RING_COVERAGE-}" ]; then
-  llvm_version=11
-fi
+llvm_version=12
 
 case $target in
    aarch64-linux-android)
@@ -105,6 +102,7 @@ case $target in
     export CC_wasm32_unknown_unknown=clang-$llvm_version
     export AR_wasm32_unknown_unknown=llvm-ar-$llvm_version
     export CARGO_TARGET_WASM32_UNKNOWN_UNKNOWN_RUNNER=wasm-bindgen-test-runner
+    export WASM_BINDGEN_TEST_TIMEOUT=60
     ;;
   *)
     ;;

mk/clippy.sh

@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/usr/bin/env bash
 #
 # Copyright 2021 Brian Smith.
 #

mk/install-build-tools.sh

@@ -32,7 +32,7 @@ case $target in
   accept_android_license=24333f8a63b6825ea9c5514f83c2829b004d1fee
   grep --quiet --no-messages "$accept_android_license" "$android_license_file" \
     || echo $accept_android_license  >> "$android_license_file"
-  sudo "${ANDROID_SDK_ROOT}/tools/bin/sdkmanager" ndk-bundle
+  "${ANDROID_SDK_ROOT}/cmdline-tools/latest/bin/sdkmanager" ndk-bundle
   ;;
 esac
 
@@ -82,14 +82,11 @@ case $target in
 esac
 
 if [ -n "$use_clang" ]; then
-  llvm_version=10
-  if [ -n "${RING_COVERAGE-}" ]; then
-    # https://github.com/rust-lang/rust/pull/79365 upgraded the coverage file
-    # format to one that only LLVM 11+ can use
-    llvm_version=11
-    sudo apt-key add mk/llvm-snapshot.gpg.key
-    sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$llvm_version main"
-    sudo apt-get update
-  fi
+  # https://github.com/rust-lang/rust/pull/79365 upgraded the coverage file
+  # format to one that only LLVM 11+ can use
+  llvm_version=12
+  sudo apt-key add mk/llvm-snapshot.gpg.key
+  sudo add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-$llvm_version main"
+  sudo apt-get update
   install_packages clang-$llvm_version llvm-$llvm_version
 fi