naskya/napi-rs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

fix(build): broken android target build caused by ndk upgrade

Browse source
This commit is contained in:
forehalo 2022-06-09 23:38:43 +08:00 committed by LongYinan
parent 548f358fdb
commit f90d63ccde
No known key found for this signature in database
GPG key ID: C3666B7FC82ADAD7
3 changed files with 24 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
.github/workflows/android-armv7.yml vendored
View file

@ -60,5 +60,5 @@ jobs:
export CARGO_TARGET_ARMV7_LINUX_ANDROIDEABI_LINKER="${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/armv7a-linux-androideabi24-clang"
yarn build:test:android:armv7
du -sh examples/napi/index.node
${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/arm-linux-androideabi-strip examples/napi/index.node
${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/llvm-strip examples/napi/index.node
du -sh examples/napi/index.node

16
crates/build/src/android.rs Normal file
View file

@ -0,0 +1,16 @@
use std::env;
use std::fs;
use std::io::{Error, Write};
use std::path;
// Workaround from https://github.com/rust-lang/rust/pull/85806#issuecomment-1096266946
pub fn setup() -> Result<(), Error> {
let out_dir = env::var("OUT_DIR").expect("OUT_DIR not set");
let mut dist = path::PathBuf::from(&out_dir);
dist.push("libgcc.a");
let mut libgcc = fs::File::create(&dist)?;
libgcc.write(b"INPUT(-lunwind)")?;
drop(libgcc);
println!("cargo:rustc-link-search={}", &out_dir);
Ok(())
}

9
crates/build/src/lib.rs
View file

@ -1,8 +1,13 @@
mod android;
mod macos;
pub fn setup() {
println!("cargo:rerun-if-env-changed=DEBUG_GENERATED_CODE");
if let Ok("macos") = std::env::var("CARGO_CFG_TARGET_OS").as_deref() {
macos::setup();
match std::env::var("CARGO_CFG_TARGET_OS").as_deref() {
Ok("macos") => {
macos::setup();
}
Ok("android") => if let Ok(_) = android::setup() {},
_ => {}
}
}