Transform bin to cdylib with exported symbols

rust-mobile · Aug 21, 2024 · c2e808c · c2e808c
1 parent caa8062
commit c2e808c
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 2 deletions.
diff --git a/cargo-apk/src/apk.rs b/cargo-apk/src/apk.rs
@@ -220,7 +220,9 @@ impl<'a> ApkBuilder<'a> {
         for target in &self.build_targets {
             let triple = target.rust_triple();
             let build_dir = self.cmd.build_dir(Some(triple));
-            let artifact = self.cmd.artifact(artifact, Some(triple), CrateType::Cdylib);
+            // TODO: Read crate type from Cargo.toml/metadata?
+            let artifact = self.cmd.artifact(artifact, Some(triple), CrateType::Bin);
+            // let artifact = self.cmd.artifact(artifact, Some(triple), CrateType::Cdylib);
 
             let mut cargo = cargo_ndk(
                 &self.ndk,

diff --git a/ndk-build/src/apk.rs b/ndk-build/src/apk.rs
@@ -122,7 +122,11 @@ impl<'a> UnalignedApk<'a> {
             return Err(NdkError::PathNotFound(path.into()));
         }
         let abi = target.android_abi();
-        let lib_path = Path::new("lib").join(abi).join(path.file_name().unwrap());
+        let mut filename = PathBuf::from(path.file_name().unwrap());
+        if filename.extension().is_none() {
+            filename = PathBuf::from(format!("lib{}.so", filename.display()));
+        }
+        let lib_path = Path::new("lib").join(abi).join(filename);
         let out = self.config.build_dir.join(&lib_path);
         std::fs::create_dir_all(out.parent().unwrap())?;
 

diff --git a/ndk-build/src/cargo.rs b/ndk-build/src/cargo.rs
@@ -68,6 +68,9 @@ pub fn cargo_ndk(
     }
     rustflags.push_str("-Clink-arg=");
     rustflags.push_str(&clang_target);
+    rustflags.push_str(SEP);
+    rustflags.push_str("-Clink-arg=-rdynamic");
+    // rustflags.push_str("-Clink-arg=-Wl,-export-dynamic");
 
     let ar = ndk.toolchain_bin("ar", target)?;
     cargo.env(format!("AR_{}", triple), &ar);