Fix android sdk brotli build break (#1047)

* Pass Android versions of Brotli libraries

* Pass triple and not module triple

---------

Co-authored-by: Leonard Grey <[email protected]>

Author: mhegazy

.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"

.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