From 99eafa64f4983b4970345aac2f822088ab36e61c Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Thu, 5 Mar 2026 16:46:24 -0500
Subject: [PATCH 01/19] Update bcny-firebase.yml

---
 .github/workflows/bcny-firebase.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index 43e5ca2da1..d3734e27ba 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -18,14 +18,14 @@ jobs:
             platform: 'ARM64'
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 1
           path: ${{ github.workspace }}/SourceCache/flatbuffers
           ref: 99aa1ef21dd9dc3f9d4fb0eb82f4b59d0bb5e4c5
           repository: google/flatbuffers
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 1
           path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk
@@ -389,7 +389,7 @@ jobs:
           - arch: 'arm64-v8a'
           - arch: 'x86_64'
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v5
         with:
           fetch-depth: 1
           path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk

From 0d45ae22983eba2ac42c6d5ab7f6a24a705d63e8 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Thu, 5 Mar 2026 16:48:18 -0500
Subject: [PATCH 02/19] Update bcny-firebase.yml

---
 .github/workflows/bcny-firebase.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index d3734e27ba..d3a55a38ab 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -180,7 +180,7 @@ jobs:
             Write-Output "Success! No BMI2 instructions were found in snappy.lib."
           }
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           name: firebase-windows-${{ matrix.arch }}
           path: ${{ github.workspace }}/BuildRoot/Library/firebase
@@ -356,7 +356,7 @@ jobs:
           "@ | Out-File -Encoding UTF8 firebase.nuspec
           nuget pack -Properties BUILDROOT=${{ github.workspace }}\BuildRoot\Library\firebase -Suffix (git -C ${{ github.workspace }}/SourceCache/firebase-cpp-sdk log -1 --format=%h) firebase.nuspec
         shell: pwsh
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         if: github.event_name != 'pull_request'
         with:
           name: windows-${{ matrix.arch }}.nupkg
@@ -517,7 +517,7 @@ jobs:
             cp $header ${header_destination_dir}/firestore/
           done
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v6
         with:
           name: firebase-android-${{ matrix.arch }}
           path: ${{ github.workspace }}/BuildRoot/Library/firebase

From a7b00671f14b34f0fecd302981301c8e90dd19c0 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Thu, 5 Mar 2026 17:13:26 -0500
Subject: [PATCH 03/19] Update bcny-firebase.yml

---
 .github/workflows/bcny-firebase.yml | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index d3a55a38ab..7afb736f02 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -18,6 +18,9 @@ jobs:
             platform: 'ARM64'
 
     steps:
+      - name: Debug vswhere location
+        shell: pwsh
+        run: where.exe vswhere
       - uses: actions/checkout@v5
         with:
           fetch-depth: 1

From bbac799731588d4650a218824c0a7cfdf7eb7e79 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Thu, 5 Mar 2026 17:16:55 -0500
Subject: [PATCH 04/19] Update bcny-firebase.yml

---
 .github/workflows/bcny-firebase.yml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index 7afb736f02..b65fcb1f4c 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -18,9 +18,6 @@ jobs:
             platform: 'ARM64'
 
     steps:
-      - name: Debug vswhere location
-        shell: pwsh
-        run: where.exe vswhere
       - uses: actions/checkout@v5
         with:
           fetch-depth: 1
@@ -36,6 +33,7 @@ jobs:
 
       - uses: compnerd/gha-setup-vsdevenv@main
         with:
+          vswhere: "C:/ProgramData/Chocolatey/bin/vswhere.exe"
           host_arch: amd64
           components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
           arch: ${{ matrix.arch }}

From 3602405f969b002a8620f852734190d3f5c79864 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Thu, 5 Mar 2026 17:18:26 -0500
Subject: [PATCH 05/19] Update bcny-firebase.yml

more logs
---
 .github/workflows/bcny-firebase.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index b65fcb1f4c..328b0f7cca 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -37,6 +37,7 @@ jobs:
           host_arch: amd64
           components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
           arch: ${{ matrix.arch }}
+          verbose: true
 
       - uses: actions/setup-python@v4
         id: python

From 41df71d3786d8c7bcaaac57ab5a787c03f08a267 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Thu, 5 Mar 2026 17:34:00 -0500
Subject: [PATCH 06/19] Update bcny-firebase.yml

---
 .github/workflows/bcny-firebase.yml | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index 328b0f7cca..ffeca59e54 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -31,13 +31,13 @@ jobs:
           path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk
           repository: thebrowsercompany/firebase-cpp-sdk
 
-      - uses: compnerd/gha-setup-vsdevenv@main
-        with:
-          vswhere: "C:/ProgramData/Chocolatey/bin/vswhere.exe"
-          host_arch: amd64
-          components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
-          arch: ${{ matrix.arch }}
-          verbose: true
+      # - uses: compnerd/gha-setup-vsdevenv@main
+      #   with:
+      #     vswhere: "C:/ProgramData/Chocolatey/bin/vswhere.exe"
+      #     host_arch: amd64
+      #     components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
+      #     arch: ${{ matrix.arch }}
+      #     verbose: true
 
       - uses: actions/setup-python@v4
         id: python

From 293faa201f9d24ad59d3e0de5b3edf2eaf39013a Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Thu, 5 Mar 2026 20:30:42 -0500
Subject: [PATCH 07/19] Update bcny-firebase.yml

---
 .github/workflows/bcny-firebase.yml | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index ffeca59e54..64652ea3b4 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -31,13 +31,7 @@ jobs:
           path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk
           repository: thebrowsercompany/firebase-cpp-sdk
 
-      # - uses: compnerd/gha-setup-vsdevenv@main
-      #   with:
-      #     vswhere: "C:/ProgramData/Chocolatey/bin/vswhere.exe"
-      #     host_arch: amd64
-      #     components: 'Microsoft.VisualStudio.Component.VC.Tools.x86.x64;Microsoft.VisualStudio.Component.VC.Tools.ARM64'
-      #     arch: ${{ matrix.arch }}
-      #     verbose: true
+      - uses: compnerd/gha-setup-vsdevenv@main
 
       - uses: actions/setup-python@v4
         id: python
@@ -383,7 +377,7 @@ jobs:
         shell: pwsh
 
   android:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-22.04
     strategy:
       fail-fast: true
       matrix:

From 23621cca32aa3a0ca34465e818efcb36b47b9e15 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:14:02 -0500
Subject: [PATCH 08/19] Update bcny-firebase.yml

---
 .github/workflows/bcny-firebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index 64652ea3b4..0931f4225b 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -377,7 +377,7 @@ jobs:
         shell: pwsh
 
   android:
-    runs-on: ubuntu-22.04
+    runs-on: ubuntu-latest
     strategy:
       fail-fast: true
       matrix:

From aea89b731ccf5b88596c90508dc8d50572a357a8 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:15:02 -0500
Subject: [PATCH 09/19] Update android.yml

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 2b4520e51d..694fef15fa 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -21,7 +21,7 @@ concurrency:
 
 jobs:
   prepare_matrix:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     outputs:
       matrix_os: ${{ steps.export-result.outputs.matrix_os }}
       matrix_architecture: ${{ steps.export-result.outputs.matrix_architecture }}

From 5c99782ae06787caacb554854e57a4f5b9850e13 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:17:12 -0500
Subject: [PATCH 10/19] Update android.yml

---
 .github/workflows/android.yml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 694fef15fa..89d9ae188d 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -27,7 +27,7 @@ jobs:
       matrix_architecture: ${{ steps.export-result.outputs.matrix_architecture }}
       matrix_python_version: ${{ steps.export-result.outputs.matrix_python_version }}
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: false
       - name: Use expanded matrix
@@ -75,7 +75,7 @@ jobs:
           echo "Enabling expanded build and test matrix."
           echo "USE_EXPANDED_MATRIX=1" >> $GITHUB_ENV
 
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v6
         with:
           submodules: true
 
@@ -97,7 +97,7 @@ jobs:
 
       - name: Cache NDK
         id: cache_ndk
-        uses: actions/cache@v3
+        uses: actions/cache@v5
         with:
           path: /tmp/android-ndk-r21e
           key: android-ndk-${{ matrix.os }}-r21e

From 75d77c01e57d0637b5eb6181115fbe552d79f744 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:20:36 -0500
Subject: [PATCH 11/19] Update print_matrix_configuration.py

---
 scripts/gha/print_matrix_configuration.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py
index cd9315f864..b77243b6de 100644
--- a/scripts/gha/print_matrix_configuration.py
+++ b/scripts/gha/print_matrix_configuration.py
@@ -89,12 +89,12 @@
 
   "android": {
     "matrix": {
-      "os": ["ubuntu-20.04", "macos-13", "windows-latest"],
+      "os": ["ubuntu-22.04", "macos-15", "windows-latest"],
       "architecture": ["x64"],
       "python_version": ["3.7"],
 
       EXPANDED_KEY: {
-        "os": ["ubuntu-20.04", "macos-13", "windows-latest"]
+        "os": ["ubuntu-22.04", "macos-15", "windows-latest"]
       }
     }
   },

From 117c4c483aa74bf9b4d0b858f6da23a3ba5ab91e Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:27:12 -0500
Subject: [PATCH 12/19] Update android.yml

---
 .github/workflows/android.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index 89d9ae188d..ed9d80b78c 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -13,7 +13,7 @@ on:
 env:
   CCACHE_DIR: ${{ github.workspace }}/ccache_dir
   GITHUB_TOKEN: ${{ github.token }}
-  xcodeVersion: "14.1"  # Only affects Mac runners, and only for prerequisites.
+  xcodeVersion: "16.4"  # Only affects Mac runners, and only for prerequisites.
 
 concurrency:
   group: ${{ github.workflow }}-${{ github.event_name }}-${{ github.head_ref || github.ref }}

From 14bb2059627ab079a09e563c019f6e91ab87fc42 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:33:06 -0500
Subject: [PATCH 13/19] Update bcny-firebase.yml

Update NDK version to LTS
---
 .github/workflows/bcny-firebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index 0931f4225b..c2536758f2 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -397,7 +397,7 @@ jobs:
 
       - name: Download Android NDK
         run: |
-          NDK_VERSION="r21e"
+          NDK_VERSION="r27d"
           NDK_FILE="android-ndk-${NDK_VERSION}-linux-x86_64.zip"
           curl -L -o "${NDK_FILE}" "https://dl.google.com/android/repository/${NDK_FILE}"
           unzip -q "${NDK_FILE}"

From 8540574b21c17781d563d66c3ff52343cc5705db Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:36:33 -0500
Subject: [PATCH 14/19] Update bcny-firebase.yml

Drop x86_64 from the url
---
 .github/workflows/bcny-firebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index c2536758f2..b8dfa20001 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -398,7 +398,7 @@ jobs:
       - name: Download Android NDK
         run: |
           NDK_VERSION="r27d"
-          NDK_FILE="android-ndk-${NDK_VERSION}-linux-x86_64.zip"
+          NDK_FILE="android-ndk-${NDK_VERSION}-linux.zip"
           curl -L -o "${NDK_FILE}" "https://dl.google.com/android/repository/${NDK_FILE}"
           unzip -q "${NDK_FILE}"
           rm "${NDK_FILE}"

From 693fa78ce7a035214c9da6dd7c9c338b4d346322 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:47:54 -0500
Subject: [PATCH 15/19] Setup old java and newer python

---
 .github/workflows/bcny-firebase.yml       | 12 ++++++++++++
 scripts/gha/print_matrix_configuration.py |  2 +-
 2 files changed, 13 insertions(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index b8dfa20001..da0fab2826 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -391,6 +391,18 @@ jobs:
           path: ${{ github.workspace }}/SourceCache/firebase-cpp-sdk
           ref: refs/heads/compnerd/swift
           repository: thebrowsercompany/firebase-cpp-sdk
+      # Currently this repo is pinned to an old version of the
+      # the firebase-cpp-sdk so we have to install an older
+      # version of java to allow this code to build correctly.
+      - name: Setup Java 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: oracle
+          java-version: '11'
+          cache: gradle
+
+      - name: Verify Java
+        run: java -version
 
       - name: Install Ninja
         run: sudo apt-get install -y ninja-build
diff --git a/scripts/gha/print_matrix_configuration.py b/scripts/gha/print_matrix_configuration.py
index b77243b6de..51b83e5c7e 100644
--- a/scripts/gha/print_matrix_configuration.py
+++ b/scripts/gha/print_matrix_configuration.py
@@ -91,7 +91,7 @@
     "matrix": {
       "os": ["ubuntu-22.04", "macos-15", "windows-latest"],
       "architecture": ["x64"],
-      "python_version": ["3.7"],
+      "python_version": ["3.11"],
 
       EXPANDED_KEY: {
         "os": ["ubuntu-22.04", "macos-15", "windows-latest"]

From 118a19aa092ca7f9b5663cc02dd9864d9802030b Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Fri, 6 Mar 2026 10:49:38 -0500
Subject: [PATCH 16/19] Change java vendor

---
 .github/workflows/bcny-firebase.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index da0fab2826..4b025c866b 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -397,7 +397,7 @@ jobs:
       - name: Setup Java 11
         uses: actions/setup-java@v4
         with:
-          distribution: oracle
+          distribution: temurin
           java-version: '11'
           cache: gradle
 

From e7e54eb27bd28a3e27b722a6bd952d4124f0d6eb Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Mon, 9 Mar 2026 13:57:12 -0400
Subject: [PATCH 17/19] Pin Java version

---
 .github/workflows/android.yml | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index ed9d80b78c..fc02965584 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -54,10 +54,14 @@ jobs:
       - name: setup Xcode version (macos)
         if: runner.os == 'macOS'
         run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
-      - name: Force Java 8 (macOS)
-        if: startsWith(matrix.os, 'macos')
-        shell: bash
-        run: echo "JAVA_HOME=${JAVA_HOME_8_X64}" >> $GITHUB_ENV
+      # This workflow still uses Gradle 6.7.1; pinning Java 11 avoids
+      # incompatibilities with newer default JDKs on hosted runners.
+      - name: Setup Java 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "11"
+          cache: gradle
       - name: Store git credentials for all git commands
         # Forces all git commands to use authenticated https, to prevent throttling.
         shell: bash

From ecd999aeb8d09c4435e2bb6510c24672f1de57c7 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Mon, 9 Mar 2026 13:59:01 -0400
Subject: [PATCH 18/19] Move to after checkout

---
 .github/workflows/android.yml | 17 +++++++++--------
 1 file changed, 9 insertions(+), 8 deletions(-)

diff --git a/.github/workflows/android.yml b/.github/workflows/android.yml
index fc02965584..9d2f2e8eaa 100644
--- a/.github/workflows/android.yml
+++ b/.github/workflows/android.yml
@@ -54,14 +54,6 @@ jobs:
       - name: setup Xcode version (macos)
         if: runner.os == 'macOS'
         run: sudo xcode-select -s /Applications/Xcode_${{ env.xcodeVersion }}.app/Contents/Developer
-      # This workflow still uses Gradle 6.7.1; pinning Java 11 avoids
-      # incompatibilities with newer default JDKs on hosted runners.
-      - name: Setup Java 11
-        uses: actions/setup-java@v4
-        with:
-          distribution: temurin
-          java-version: "11"
-          cache: gradle
       - name: Store git credentials for all git commands
         # Forces all git commands to use authenticated https, to prevent throttling.
         shell: bash
@@ -83,6 +75,15 @@ jobs:
         with:
           submodules: true
 
+      # This workflow still uses Gradle 6.7.1; pinning Java 11 avoids
+      # incompatibilities with newer default JDKs on hosted runners.
+      - name: Setup Java 11
+        uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: "11"
+          cache: gradle
+
       - name: Set env variables for subsequent steps (all)
         shell: bash
         run: |

From ef15e4edd75591ed5b912fdf4b656623902ea8d9 Mon Sep 17 00:00:00 2001
From: Brian Michel <brian@thebrowser.company>
Date: Mon, 9 Mar 2026 14:08:56 -0400
Subject: [PATCH 19/19] Revert NDK version

---
 .github/workflows/bcny-firebase.yml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/bcny-firebase.yml b/.github/workflows/bcny-firebase.yml
index 4b025c866b..e8dae83655 100644
--- a/.github/workflows/bcny-firebase.yml
+++ b/.github/workflows/bcny-firebase.yml
@@ -409,8 +409,8 @@ jobs:
 
       - name: Download Android NDK
         run: |
-          NDK_VERSION="r27d"
-          NDK_FILE="android-ndk-${NDK_VERSION}-linux.zip"
+          NDK_VERSION="r21e"
+          NDK_FILE="android-ndk-${NDK_VERSION}-linux-x86_64.zip"
           curl -L -o "${NDK_FILE}" "https://dl.google.com/android/repository/${NDK_FILE}"
           unzip -q "${NDK_FILE}"
           rm "${NDK_FILE}"