Skip to content

ndk-build: Make platform SDK parsing more robust and ignore minor suffix #75

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

Draft
MarijnS95 wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

ndk-build: Make platform SDK parsing more robust and ignore minor suffix #75

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion ndk-build/src/apk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ impl ApkConfig {
self.build_dir.join(format!("{}.apk", self.apk_name))
}

pub fn create_apk(&self) -> Result<UnalignedApk, NdkError> {
pub fn create_apk(&self) -> Result<UnalignedApk<'_>, NdkError> {
std::fs::create_dir_all(&self.build_dir)?;
self.manifest.write_to(&self.build_dir)?;

Expand Down
23 changes: 21 additions & 2 deletions ndk-build/src/ndk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,8 +130,25 @@ impl Ndk {
.filter(|path| path.path().is_dir())
.filter_map(|path| path.file_name().into_string().ok())
.filter_map(|name| {
name.strip_prefix("android-")
.and_then(|api| api.parse::<u32>().ok())
let mut version = name
.strip_prefix("android-")
.expect("Invalid platform name");
if let Some((_v, ext)) = version.split_once("-ext") {
// version = v;
let _ext_version = ext.parse::<u32>();
eprintln!("Skipping platform SDK with extensions `{name}`");
return None;
}
if let Some((v, minor_version)) = version.split_once('.') {
let _minor_version = minor_version.parse::<u32>();
eprintln!("Ignoring minor suffix on SDK version `{version}`");
version = v;
}
Some(
version
.parse::<u32>()
.expect("Invalid platform SDK version"),
)
})
.filter(|level| (min_platform_level..=max_platform_level).contains(level))
.collect();
Expand Down Expand Up @@ -214,6 +231,8 @@ impl Ndk {
let dir = self
.sdk_path
.join("platforms")
// TODO: If selected/used by Self::highest_supported_platform(),
// append the minor suffix
.join(format!("android-{platform}"));
if !dir.exists() {
return Err(NdkError::PlatformNotFound(platform));
Expand Down