Skip to content

Fix aapt add lib #103

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
enfipy merged 1 commit into from
Jul 13, 2022
Merged

Fix aapt add lib #103

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
14 changes: 5 additions & 9 deletions crossbundle/tools/src/commands/android/add_libs_into_apk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ pub fn add_libs_into_apk(
&mut needed_libs,
)?;
let abi = build_target.android_abi();
let out_dir = build_dir.join("libs").join(abi);
let out_dir = build_dir.join("lib").join(abi);
for (_lib_name, lib_path) in needed_libs {
aapt_add_lib(sdk, apk_path, &lib_path, &out_dir, abi)?;
}
Expand All @@ -70,14 +70,10 @@ fn aapt_add_lib(
// `aapt a[dd] [-v] file.{zip,jar,apk} file1 [file2 ...]`
// Add specified files to Zip-compatible archive
let apk_dir = apk_path.parent().unwrap();
let add_lib = apk_dir
.parent()
.unwrap()
.join("libs")
.join(abi)
.join(file_name.to_str().unwrap());
let mut aapt = sdk.build_tool(bin!("aapt"), Some(apk_dir))?;
aapt.arg("add").arg(apk_path).arg(add_lib);
let mut aapt = sdk.build_tool(bin!("aapt"), Some(apk_dir.parent().unwrap()))?;
aapt.arg("add")
.arg(apk_path)
.arg(format!("lib/{}/{}", abi, file_name.to_str().unwrap()));
aapt.output_err(true)?;
Ok(())
}
Expand Down