From 2641399b2f2df4eca4729667152bed92a29c4901 Mon Sep 17 00:00:00 2001
From: Alex Lorenz <arphaman@gmail.com>
Date: Mon, 9 Sep 2024 14:09:54 -0700
Subject: [PATCH] update firebase cpp sdk and toolchain

---
 .github/workflows/build.yml | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index e0ac2b3..08bf677 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -99,7 +99,7 @@ jobs:
             tag: DEVELOPMENT-SNAPSHOT-2024-08-02-a
 
             abi: arm64-v8a
-            options: -sdk ${env:SDKROOT}\..\..\..\..\Android.platform\Developer\SDKs\Android.sdk -sysroot ${env:ANDROID_NDK_ROOT}\toolchains\llvm\prebuilt\windows-x86_64\sysroot -I${env:SDKROOT}\..\..\..\..\..\..\Toolchains\0.0.0+Asserts\usr\include -Xlinker -zdefs
+            options: -sdk ${env:SDKROOT}\..\..\..\..\Android.platform\Developer\SDKs\Android.sdk -sysroot ${env:ANDROID_NDK_ROOT}\toolchains\llvm\prebuilt\windows-x86_64\sysroot -I${env:SDKROOT}\usr\include -I${env:SDKROOT}\..\..\..\..\..\..\Toolchains\0.0.0+Asserts\usr\include -Xlinker -zdefs
             target: aarch64-unknown-linux-android28
 
     name: CMake (Android) - Swift ${{ matrix.tag }}
@@ -114,21 +114,20 @@ jobs:
           github-repo: thebrowsercompany/swift-build
           github-token: ${{ secrets.GITHUB_TOKEN }}
           release-asset-name: installer-amd64.exe
-          release-tag-name: "20240802.2"
+          release-tag-name: "20240909.3"
 
       - uses: actions/checkout@v4
 
       - uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4 # v1.1.1
         with:
           repo: thebrowsercompany/firebase-cpp-sdk
-          version: tags/20240709.0
+          version: tags/20240909.0
           file: firebase-android-arm64-v8a.zip
 
-      # FIXME(compnerd) workaround missing headers in the android builds
       - uses: dsaltares/fetch-gh-release-asset@a40c8b4a0471f9ab81bdf73a010f74cc51476ad4 # v1.1.1
         with:
           repo: thebrowsercompany/firebase-cpp-sdk
-          version: tags/20240709.0
+          version: tags/20240909.0
           file: firebase-windows-amd64.zip
 
       - run: |
@@ -140,6 +139,7 @@ jobs:
         shell: powershell
 
       - uses: nttld/setup-ndk@afb4c9964b521afb97c864b7d40b11e6911bd410 # v1.5.0
+        id: setup-ndk
         with:
           ndk-version: r26d
 
@@ -153,6 +153,8 @@ jobs:
           packages: 'platforms;android-21'
 
       - name: Configure
+        env:
+          ANDROID_NDK_ROOT: ${{ steps.setup-ndk.outputs.ndk-path }}
         run: |
           cmake -B out `
                 -D CMAKE_BUILD_TYPE=RelWithDebInfo `