From 4be3719c767799e8fcf8c9207ce0e6fd9e03326b Mon Sep 17 00:00:00 2001
From: Leonard Grey <leonard@leonardgrey.com>
Date: Mon, 20 Oct 2025 09:02:32 -0400
Subject: [PATCH 1/2] Pass Android versions of Brotli libraries

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

diff --git a/.github/workflows/swift-toolchain.yml b/.github/workflows/swift-toolchain.yml
index 95450ff14..161bca86d 100644
--- a/.github/workflows/swift-toolchain.yml
+++ b/.github/workflows/swift-toolchain.yml
@@ -1614,8 +1614,8 @@ jobs:
               'ZLIB_ROOT' = "${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr";
               'ZLIB_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/zlib-${{ inputs.zlib_version }}/usr/lib/zlibstatic.lib";
               'BROTLI_INCLUDE_DIR' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/include";
-              'BROTLICOMMON_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/brotlicommon.lib";
-              'BROTLIDEC_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/brotlidec.lib";
+              'BROTLICOMMON_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/$(if ("${{ matrix.os }}" -eq "Windows") { "brotlicommon.lib" } else { "libbrotlicommon.a" })";
+              'BROTLIDEC_LIBRARY' = "${{ github.workspace }}/BuildRoot/Library/brotli-${{ inputs.brotli_version }}/usr/lib/$(if ("${{ matrix.os }}" -eq "Windows") { "brotlidec.lib" } else { "libbrotlidec.a" })";
               'CMAKE_C_FLAGS' = "${{ inputs.use_host_toolchain && '' || '-fuse-ld=lld' }}";
             }
       - name: Build curl

From 2254fa4eab684a1663a20fa3ef1bf5d4e9ee12e8 Mon Sep 17 00:00:00 2001
From: Mohamed Hegazy <mhegazy@thebrowser.company>
Date: Mon, 20 Oct 2025 15:30:39 -0700
Subject: [PATCH 2/2] Pass triple and not module triple

---
 .github/actions/configure-cmake-project/action.yml | 12 ++----------
 1 file changed, 2 insertions(+), 10 deletions(-)

diff --git a/.github/actions/configure-cmake-project/action.yml b/.github/actions/configure-cmake-project/action.yml
index 10c8d9f7b..12dc3d0bf 100644
--- a/.github/actions/configure-cmake-project/action.yml
+++ b/.github/actions/configure-cmake-project/action.yml
@@ -299,11 +299,7 @@ runs:
               }
 
               Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
-
-              $TargetInfo = & $SWIFTC -target $Triple -print-target-info
-              $TargetInfo = $TargetInfo | ConvertFrom-Json
-              $TargetInfo = $TargetInfo.target.moduleTriple
-              Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $TargetInfo
+              Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Triple
 
               # TODO(compnerd): remove this once we have the early swift-driver
               Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"
@@ -418,11 +414,7 @@ runs:
                 "swiftc.exe"
               }
               Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER $SWIFTC
-
-              $TargetInfo = & $SWIFTC -target $Triple -print-target-info
-              $TargetInfo = $TargetInfo | ConvertFrom-Json
-              $TargetInfo = $TargetInfo.target.moduleTriple
-              Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $TargetInfo
+              Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_TARGET $Triple
 
               # TODO(compnerd) remove this once we have the early swift-driver
               Add-KeyValueIfNew $Defines CMAKE_Swift_COMPILER_USE_OLD_DRIVER "YES"