Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
8 changes: 6 additions & 2 deletions xbuild/src/cargo/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -330,7 +330,9 @@ impl CargoBuild {
self.set_sysroot(&path);
self.add_cxxflag("-stdlib=libc++");
self.add_cflag(&format!("-mmacosx-version-min={minimum_version}"));
self.add_link_arg("--target=x86_64-apple-darwin");
if let Some(triple) = self.triple {
self.add_link_arg(&format!("--target={triple}"));
}
self.add_link_arg(&format!("-mmacosx-version-min={minimum_version}"));
self.add_link_arg("-rpath");
self.add_link_arg("@executable_path/../Frameworks");
Expand Down Expand Up @@ -360,7 +362,9 @@ impl CargoBuild {
self.set_sysroot(&path);
self.add_cxxflag("-stdlib=libc++");
self.add_cflag(&format!("-miphoneos-version-min={minimum_version}"));
self.add_link_arg("--target=arm64-apple-ios");
if let Some(triple) = self.triple {
self.add_link_arg(&format!("--target={triple}"));
}
self.add_link_arg(&format!("-miphoneos-version-min={minimum_version}"));
self.add_link_arg("-rpath");
self.add_link_arg("@executable_path/Frameworks");
Expand Down
26 changes: 25 additions & 1 deletion xbuild/src/command/build.rs
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,25 @@ pub fn build(env: &BuildEnv) -> Result<()> {
}
}
Platform::Android => {
let out = platform_dir.join(format!("{}.{}", env.name(), env.target().format()));
// Include architecture in filename for Android builds
let arch_suffix = if env.target().archs().len() == 1 {
format!("-{}", env.target().archs()[0])
} else {
// Multi-arch build, use "universal" or concatenate all archs
if env.target().archs().len() > 1 {
let archs: Vec<String> =
env.target().archs().iter().map(|a| a.to_string()).collect();
format!("-{}", archs.join("-"))
} else {
String::new()
}
};
let out = platform_dir.join(format!(
"{}{}.{}",
env.name(),
arch_suffix,
env.target().format()
));
ensure!(has_lib, "Android APKs/AABs require a library");

let mut libraries = vec![];
Expand Down Expand Up @@ -200,6 +218,7 @@ pub fn build(env: &BuildEnv) -> Result<()> {
runner.end_verbose_task();
return Ok(());
} else {
let out_clone = out.clone();
let mut apk = Apk::new(
out,
env.config().android().manifest.clone(),
Expand All @@ -220,6 +239,11 @@ pub fn build(env: &BuildEnv) -> Result<()> {
}

apk.finish(env.target().signer().cloned())?;

// Handle additional Android signing if release build and signing parameters are provided
if env.target().opt() == Opt::Release {
crate::gradle::handle_android_signing_for_apk(env, &out_clone)?;
}
}
}
Platform::Macos => {
Expand Down
Loading
Loading