Skip to content

Support 16 KB page sizes. #176

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
ncalexan merged 1 commit into from
Aug 21, 2026
Merged

Support 16 KB page sizes. #176

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 12 additions & 4 deletions plugin/src/main/kotlin/com/nishtahir/CargoBuildTask.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ abstract class CargoBuildTask : DefaultTask() {

// Target-specific environment configuration, passed through to
// the underlying `cargo build` invocation.
val toolchain_target = toolchain.target.toUpperCase().replace('-', '_')
val toolchain_target = toolchain.target.uppercase().replace('-', '_')
val prefix = "RUST_ANDROID_GRADLE_TARGET_${toolchain_target}_"

// For ORG_GRADLE_PROJECT_RUST_ANDROID_GRADLE_TARGET_x_KEY=VALUE, set KEY=VALUE.
Expand Down Expand Up @@ -242,11 +242,19 @@ abstract class CargoBuildTask : DefaultTask() {
environment("RUST_ANDROID_GRADLE_LINKER_WRAPPER_PY",
File(rootBuildDir, "linker-wrapper/linker-wrapper.py").path)
environment("RUST_ANDROID_GRADLE_CC", cc)

var extras = ""
if (generateBuildId) {
environment("RUST_ANDROID_GRADLE_CC_LINK_ARG", "-Wl,--build-id,-soname,lib${libname!!}.so")
} else {
environment("RUST_ANDROID_GRADLE_CC_LINK_ARG", "-Wl,-soname,lib${libname!!}.so")
extras += "--build-id,"
}

if (ndkVersionMajor <= 27) {
// Per https://developer.android.com/guide/practices/page-sizes#compile-16-kb-alignment.
extras += "-z,max-page-size=16384,"
extras += "-z,common-page-size=16384,"
}

environment("RUST_ANDROID_GRADLE_CC_LINK_ARG", "-Wl,${extras}-soname,lib${libname!!}.so")
}

extraCargoBuildArguments?.let {
Expand Down