Merge branch 'staging' into use_system_secure_storage_deps

Author: danrmiller

Dockerfile

@@ -6,19 +6,20 @@ ENV DEBIAN_FRONTEND=noninteractive \
     LANG=C.UTF-8 \
     LC_ALL=C.UTF-8
 
+SHELL ["/bin/bash", "-o", "pipefail", "-c"]
+
 RUN apt-get update && apt-get install -y --no-install-recommends \
-      ca-certificates curl git gnupg sudo xz-utils file python3 unzip \
-      build-essential automake cmake meson ninja-build pkg-config libtool \
-      libglib2.0-dev libgtk-3-dev liblzma-dev \
-      libgcrypt20-dev libgirepository1.0-dev \
-      libgit2-dev clang rsync \
-      libncurses5-dev libncursesw5-dev zlib1g-dev llvm debhelper \
-      libclang-dev opencl-headers libssl-dev ocl-icd-opencl-dev \
-      valac libtss2-dev libsecret-1-dev libjsoncpp-dev \
+      ca-certificates curl file git gnupg python3 sudo unzip xz-utils \
+      automake build-essential cmake debhelper libtool meson ninja-build pkg-config rsync \
+      clang libclang-dev llvm \
+      libgcrypt20-dev libgirepository1.0-dev libgit2-dev libglib2.0-dev libgtk-3-dev \
+      libjsoncpp-dev liblzma-dev libncurses5-dev libncursesw5-dev \
+      libsecret-1-dev libssl-dev libtss2-dev \
+      ocl-icd-opencl-dev opencl-headers valac zlib1g-dev \
+      g++-aarch64-linux-gnu gcc-aarch64-linux-gnu \
+      g++-mingw-w64-x86-64 gcc-mingw-w64-x86-64 \
  && rm -rf /var/lib/apt/lists/*
 
-SHELL ["/bin/bash", "-o", "pipefail", "-c"]
-
 RUN curl -fsSL https://deb.nodesource.com/setup_24.x | bash - \
  && apt-get install -y --no-install-recommends nodejs \
  && rm -rf /var/lib/apt/lists/*
@@ -34,6 +35,15 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs \
  && cargo install cargo-ndk \
  && chmod -R a+rwX "$CARGO_HOME" "$RUSTUP_HOME"
 
+ENV ANDROID_NDK_ROOT=/opt/android-ndk-r28 \
+    ANDROID_NDK_HOME=/opt/android-ndk-r28
+
+RUN curl -fsSL https://dl.google.com/android/repository/android-ndk-r28-linux.zip \
+      -o /tmp/android-ndk.zip \
+ && echo "a186b67e8810cb949514925e4f7a2255548fb55f5e9b0824a6430d012c1b695b  /tmp/android-ndk.zip" | sha256sum -c \
+ && unzip -q /tmp/android-ndk.zip -d /opt \
+ && rm /tmp/android-ndk.zip
+
 ENV FLUTTER_HOME=/opt/flutter \
     PATH=/opt/flutter/bin:/opt/flutter/bin/cache/dart-sdk/bin:$PATH