Skip to content

build.ps1: build brotli for Android #84883

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 16, 2025
+31 −13
Merged

build.ps1: build brotli for Android #84883

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9e8ba0c
build.ps1: build brotli for Android
compnerd Oct 14, 2025
3a80993
build.ps1: repair the Android SDK build
compnerd Oct 14, 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
44 changes: 31 additions & 13 deletions utils/build.ps1
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2479,9 +2479,9 @@ function Build-Brotli([Hashtable] $Platform) {
Build-CMakeProject `
-Src $SourceCache\brotli `
-Bin "$(Get-ProjectBinaryCache $Platform brotli)" `
-InstallTo "$BinaryCache\$($Platform.Triple)\usr" `
-Platform $Platform `
-UseMSVCCompilers C `
-BuildTargets default `
-Defines @{
BUILD_SHARED_LIBS = "NO";
CMAKE_POSITION_INDEPENDENT_CODE = "YES";
Expand Down Expand Up @@ -2572,6 +2572,17 @@ function Build-CURL([Hashtable] $Platform) {
BUILD_SHARED_LIBS = "NO";
BUILD_TESTING = "NO";
CMAKE_POSITION_INDEPENDENT_CODE = "YES";
BROTLI_INCLUDE_DIR = "$SourceCache\brotli\c\include";
Copy link
Member

@etcwilde etcwilde Oct 15, 2025 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Any idea why the find_package(Brotli) isn't finding these directories? It looks like brotli is getting installed under b\aarch64-unknown-linux-android28\{include\,lib\} (in the case of the Android build, of course)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

brotli doesn't seem to have the config files for CMake to locate the package. pkg-config cannot be used as that is not a standard Windows tool. As a result, we need to pass along the paths ourselves.

I've taken this opportunity to simply not even install brotli. This is a micro-optimization as it avoids some additional disk I/O.

BROTLICOMMON_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
"$(Get-ProjectBinaryCache $Platform brotli)\brotlicommon.lib"
} else {
"$(Get-ProjectBinaryCache $Platform brotli)\libbrotlicommon.a"
};
BROTLIDEC_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
"$(Get-ProjectBinaryCache $Platform brotli)\brotlidec.lib"
} else {
"$(Get-ProjectBinaryCache $Platform brotli)\libbrotlidec.a"
}
BUILD_CURL_EXE = "NO";
BUILD_LIBCURL_DOCS = "NO";
BUILD_MISC_DOCS = "NO";
Expand Down Expand Up @@ -2656,7 +2667,6 @@ function Build-CURL([Hashtable] $Platform) {
USE_WIN32_LDAP = "NO";
ZLIB_ROOT = "$BinaryCache\$($Platform.Triple)\usr";
ZLIB_LIBRARY = "$BinaryCache\$($Platform.Triple)\usr\lib\zlibstatic.lib";
BROTLI_DIR = "$BinaryCache\$($Platform.Triple)\usr";
})
}

Expand Down Expand Up @@ -3046,6 +3056,17 @@ function Build-Foundation([Hashtable] $Platform) {
# FIXME(compnerd) - workaround ARM64 build failure when cross-compiling.
CMAKE_NINJA_FORCE_RESPONSE_FILE = "YES";
CMAKE_STATIC_LIBRARY_PREFIX_Swift = "lib";
BROTLI_INCLUDE_DIR = "$SourceCache\brotli\c\include";
BROTLICOMMON_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
"$(Get-ProjectBinaryCache $Platform brotli)\brotlicommon.lib"
} else {
"$(Get-ProjectBinaryCache $Platform brotli)\libbrotlicommon.a"
};
BROTLIDEC_LIBRARY = if ($Platform.OS -eq [OS]::Windows) {
"$(Get-ProjectBinaryCache $Platform brotli)\brotlidec.lib"
} else {
"$(Get-ProjectBinaryCache $Platform brotli)\libbrotlidec.a"
}
FOUNDATION_BUILD_TOOLS = if ($Platform.OS -eq [OS]::Windows) { "YES" } else { "NO" };
CURL_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\CURL";
LibXml2_DIR = "$BinaryCache\$($Platform.Triple)\usr\lib\cmake\libxml2-2.11.5";
Expand All @@ -3056,7 +3077,6 @@ function Build-Foundation([Hashtable] $Platform) {
};
ZLIB_INCLUDE_DIR = "$BinaryCache\$($Platform.Triple)\usr\include";
dispatch_DIR = (Get-ProjectCMakeModules $Platform Dispatch);
BROTLI_DIR = "$BinaryCache\$($Platform.Triple)\usr";
_SwiftFoundation_SourceDIR = "$SourceCache\swift-foundation";
_SwiftFoundationICU_SourceDIR = "$SourceCache\swift-foundation-icu";
_SwiftCollections_SourceDIR = "$SourceCache\swift-collections";
Expand All @@ -3081,7 +3101,7 @@ function Test-Foundation {
$env:LIBXML_LIBRARY_PATH="$BinaryCache/$($Platform.Triple)/usr/lib"
$env:LIBXML_INCLUDE_PATH="$BinaryCache/$($Platform.Triple)/usr/include/libxml2"
$env:ZLIB_LIBRARY_PATH="$BinaryCache/$($Platform.Triple)/usr/lib"
$env:BROTLI_LIBRARY_PATH="$BinaryCache/$($Platform.Triple)/usr/lib"
$env:BROTLI_LIBRARY_PATH="$(Get-ProjectBinaryCache $BuildPlatform brotli)"
$env:CURL_LIBRARY_PATH="$BinaryCache/$($Platform.Triple)/usr/lib"
$env:CURL_INCLUDE_PATH="$BinaryCache/$($Platform.Triple)/usr/include"
Build-SPMProject `
Expand Down Expand Up @@ -4196,15 +4216,12 @@ if (-not $SkipBuild) {
if (-not $Build.LinkModes.Contains("static")) { continue }

$SDKROOT = Get-SwiftSDK -OS $Build.OS -Identifier "$($Build.OS)Experimental"
Copy-Item -Force `
-Path "${BinaryCache}\$($Build.Triple)\curl\lib\libcurl.lib" `
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\libcurl.lib" | Out-Null
Copy-Item -Force `
-Path "${BinaryCache}\$($Build.Triple)\libxml2-2.11.5\libxml2s.lib" `
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\libxml2s.lib" | Out-Null
Copy-Item -Force `
-Path "${BinaryCache}\$($Build.Triple)\zlib\zlibstatic.lib" `
-Destination "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)\zlibstatic.lib" | Out-Null
$SwiftResourceDir = "${SDKROOT}\usr\lib\swift_static\$($Build.OS.ToString().ToLowerInvariant())\$($Build.Architecture.LLVMName)"
Copy-Item -Force -Path "$(Get-ProjectBinaryCache $Build brotli)\brotlicommon.lib" -Destination "${SwiftResourceDir}\brotlicommon.lib" | Out-Null
Copy-Item -Force -Path "$(Get-ProjectBinaryCache $Build brotli)\brotlidec.lib" -Destination "${SwiftResourceDir}\brotlidec.lib" | Out-Null
Copy-Item -Force -Path "${BinaryCache}\$($Build.Triple)\curl\lib\libcurl.lib" -Destination "${SwiftResourceDir}\libcurl.lib" | Out-Null
Copy-Item -Force -Path "${BinaryCache}\$($Build.Triple)\libxml2-2.11.5\libxml2s.lib" -Destination "${SwiftResourceDir}\libxml2s.lib" | Out-Null
Copy-Item -Force -Path "${BinaryCache}\$($Build.Triple)\zlib\zlibstatic.lib" -Destination "${SwiftResourceDir}\zlibstatic.lib" | Out-Null
}
}

Expand All @@ -4215,6 +4232,7 @@ if (-not $SkipBuild) {
}

Invoke-BuildStep Build-ZLib $Build
Invoke-BuildStep Build-Brotli $Build
Invoke-BuildStep Build-XML2 $Build
Invoke-BuildStep Build-CURL $Build
}
Expand Down