Build #10 failed with: ld.lld: error: duplicate symbol: pthread_create >>> defined at pthread_shim.c:30 >>> ... in archive libpthread_shim.a (the other definition coming from libstd's bundled libc.a stub) The raw-symbol-override approach was naive: when two static archives both define the same symbol the linker refuses instead of picking one. Switch to GNU-ld's `--wrap=pthread_create` mechanism: - All `pthread_create` references get rewritten to `__wrap_pthread_create` - Our shim now defines `__wrap_pthread_create` (no symbol clash) - Inside the shim we `dlopen("libc.so")` + `dlsym("pthread_create")` to get the real runtime symbol directly, bypassing BOTH the broken static stub (libstd's libc.a copy) AND libstd's own pthread_create path - `--real_pthread_create` is deliberately NOT used — it would alias the same broken stub the wrap exists to avoid The wrap flag is emitted via `cargo:rustc-link-arg` in build.rs so it only affects the Android target (the Android-branch of build.rs is the only place that emits it). Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
165 lines
6.4 KiB
Rust
165 lines
6.4 KiB
Rust
use std::path::PathBuf;
|
|
use std::process::Command;
|
|
|
|
fn main() {
|
|
// ─── Embedded git hash ─────────────────────────────────────────────────
|
|
let git_hash = Command::new("git")
|
|
.args(["rev-parse", "--short", "HEAD"])
|
|
.output()
|
|
.ok()
|
|
.filter(|o| o.status.success())
|
|
.and_then(|o| String::from_utf8(o.stdout).ok())
|
|
.map(|s| s.trim().to_string())
|
|
.unwrap_or_else(|| "unknown".into());
|
|
|
|
println!("cargo:rustc-env=WZP_GIT_HASH={git_hash}");
|
|
println!("cargo:rerun-if-changed=../../.git/HEAD");
|
|
println!("cargo:rerun-if-changed=../../.git/refs/heads");
|
|
|
|
// ─── Oboe C++ bridge (Android only) ────────────────────────────────────
|
|
let target = std::env::var("TARGET").unwrap_or_default();
|
|
if target.contains("android") {
|
|
build_oboe_android(&target);
|
|
}
|
|
|
|
tauri_build::build()
|
|
}
|
|
|
|
fn build_oboe_android(target: &str) {
|
|
// Rerun if bridge sources change
|
|
println!("cargo:rerun-if-changed=cpp/oboe_bridge.cpp");
|
|
println!("cargo:rerun-if-changed=cpp/oboe_bridge.h");
|
|
println!("cargo:rerun-if-changed=cpp/oboe_stub.cpp");
|
|
println!("cargo:rerun-if-changed=cpp/getauxval_fix.c");
|
|
|
|
// getauxval_fix: override broken static getauxval from compiler-rt that
|
|
// SIGSEGVs in shared libraries (runs before any app code).
|
|
cc::Build::new()
|
|
.file("cpp/getauxval_fix.c")
|
|
.compile("getauxval_fix");
|
|
|
|
// pthread_shim: interpose pthread_create so Rust libstd can't use the
|
|
// broken static pthread_create stub (which calls __init_tcb, crashing
|
|
// in a .so). Our shim forwards to libc.so's real one via RTLD_NEXT.
|
|
// Compiled as its own static lib so the linker links it ahead of libstd.
|
|
cc::Build::new()
|
|
.file("cpp/pthread_shim.c")
|
|
.compile("pthread_shim");
|
|
|
|
let oboe_dir = fetch_oboe();
|
|
match oboe_dir {
|
|
Some(oboe_path) => {
|
|
println!("cargo:warning=Building with Oboe from {:?}", oboe_path);
|
|
|
|
let mut build = cc::Build::new();
|
|
build
|
|
.cpp(true)
|
|
.std("c++17")
|
|
// Shared libc++ — static pulls broken libc stubs that crash
|
|
// in shared libraries (getauxval, __init_tcb, pthread_create).
|
|
.cpp_link_stdlib(Some("c++_shared"))
|
|
.include("cpp")
|
|
.include(oboe_path.join("include"))
|
|
.include(oboe_path.join("src"))
|
|
.define("WZP_HAS_OBOE", None)
|
|
.file("cpp/oboe_bridge.cpp");
|
|
|
|
add_cpp_files_recursive(&mut build, &oboe_path.join("src"));
|
|
build.compile("oboe_bridge");
|
|
}
|
|
None => {
|
|
println!("cargo:warning=Oboe not found, building with stub");
|
|
cc::Build::new()
|
|
.cpp(true)
|
|
.std("c++17")
|
|
.cpp_link_stdlib(Some("c++_shared"))
|
|
.file("cpp/oboe_stub.cpp")
|
|
.include("cpp")
|
|
.compile("oboe_bridge");
|
|
}
|
|
}
|
|
|
|
// libc++_shared.so must sit next to libwzp_desktop_lib.so in jniLibs —
|
|
// copy it there from the NDK sysroot. Tauri's gradle project expects the
|
|
// jniLibs in gen/android/app/src/main/jniLibs/<abi>/.
|
|
if let Ok(ndk) = std::env::var("ANDROID_NDK_HOME")
|
|
.or_else(|_| std::env::var("NDK_HOME"))
|
|
{
|
|
let (triple, abi) = match target {
|
|
t if t.contains("aarch64") => ("aarch64-linux-android", "arm64-v8a"),
|
|
t if t.contains("armv7") => ("arm-linux-androideabi", "armeabi-v7a"),
|
|
t if t.contains("x86_64") => ("x86_64-linux-android", "x86_64"),
|
|
t if t.contains("i686") => ("i686-linux-android", "x86"),
|
|
_ => ("aarch64-linux-android", "arm64-v8a"),
|
|
};
|
|
let lib_dir = format!(
|
|
"{ndk}/toolchains/llvm/prebuilt/linux-x86_64/sysroot/usr/lib/{triple}"
|
|
);
|
|
println!("cargo:rustc-link-search=native={lib_dir}");
|
|
|
|
let shared_so = format!("{lib_dir}/libc++_shared.so");
|
|
if std::path::Path::new(&shared_so).exists() {
|
|
let manifest = std::env::var("CARGO_MANIFEST_DIR").unwrap_or_default();
|
|
// Tauri mobile layout: gen/android/app/src/main/jniLibs/<abi>/
|
|
let jni_dir = format!("{manifest}/gen/android/app/src/main/jniLibs/{abi}");
|
|
if std::fs::create_dir_all(&jni_dir).is_ok() {
|
|
let _ = std::fs::copy(&shared_so, format!("{jni_dir}/libc++_shared.so"));
|
|
println!("cargo:warning=Copied libc++_shared.so to {jni_dir}");
|
|
}
|
|
}
|
|
}
|
|
|
|
// Oboe requires Android log + OpenSLES backends
|
|
println!("cargo:rustc-link-lib=log");
|
|
println!("cargo:rustc-link-lib=OpenSLES");
|
|
|
|
// Wrap pthread_create: redirect every `pthread_create` reference to our
|
|
// `__wrap_pthread_create` in pthread_shim.c, which forwards to the real
|
|
// libc.so symbol via dlsym. Without this the linker binds to libstd's
|
|
// bundled broken static pthread_create stub (see pthread_shim.c).
|
|
println!("cargo:rustc-link-arg=-Wl,--wrap=pthread_create");
|
|
}
|
|
|
|
/// Recursively add all .cpp files from a directory to a cc::Build.
|
|
fn add_cpp_files_recursive(build: &mut cc::Build, dir: &std::path::Path) {
|
|
if !dir.is_dir() {
|
|
return;
|
|
}
|
|
for entry in std::fs::read_dir(dir).unwrap() {
|
|
let entry = entry.unwrap();
|
|
let path = entry.path();
|
|
if path.is_dir() {
|
|
add_cpp_files_recursive(build, &path);
|
|
} else if path.extension().map_or(false, |e| e == "cpp") {
|
|
build.file(&path);
|
|
}
|
|
}
|
|
}
|
|
|
|
/// Try to find or fetch Oboe headers + source (v1.8.1).
|
|
fn fetch_oboe() -> Option<PathBuf> {
|
|
let out_dir = PathBuf::from(std::env::var("OUT_DIR").unwrap());
|
|
let oboe_dir = out_dir.join("oboe");
|
|
|
|
if oboe_dir.join("include").join("oboe").join("Oboe.h").exists() {
|
|
return Some(oboe_dir);
|
|
}
|
|
|
|
let status = Command::new("git")
|
|
.args([
|
|
"clone",
|
|
"--depth=1",
|
|
"--branch=1.8.1",
|
|
"https://github.com/google/oboe.git",
|
|
oboe_dir.to_str().unwrap(),
|
|
])
|
|
.status();
|
|
|
|
match status {
|
|
Ok(s) if s.success() && oboe_dir.join("include").join("oboe").join("Oboe.h").exists() => {
|
|
Some(oboe_dir)
|
|
}
|
|
_ => None,
|
|
}
|
|
}
|