Skip to content

Fix andorid sdk brotli build break #1047

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 21, 2025
Merged

Fix andorid sdk brotli build break #1047

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4be3719
Pass Android versions of Brotli libraries
speednoisemovement Oct 20, 2025
2254fa4
Pass triple and not module triple
mhegazy Oct 20, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions .github/actions/configure-cmake-project/action.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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"
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/swift-toolchain.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down