Skip to content

Add error case when available platforms aren't in supported range #79

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

Open
PoignardAzur wants to merge 1 commit into
base: main
Choose a base branch
from
+14 −1
Open

Add error case when available platforms aren't in supported range #79

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: 2 additions & 0 deletions ndk-build/src/error.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,8 @@ pub enum NdkError {
BuildToolsNotFound,
#[error("Android SDK has no platforms installed.")]
NoPlatformFound,
#[error("Android SDK has no platforms installed between level {0} and {1}.")]
NoPlatformInRange(u32, u32),
#[error("Platform `{0}` is not installed.")]
PlatformNotFound(u32),
#[error("Target is not supported.")]
Expand Down
13 changes: 12 additions & 1 deletion ndk-build/src/ndk.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,13 +133,24 @@ impl Ndk {
name.strip_prefix("android-")
.and_then(|api| api.parse::<u32>().ok())
})
.filter(|level| (min_platform_level..=max_platform_level).contains(level))
.collect();

if platforms.is_empty() {
return Err(NdkError::NoPlatformFound);
}

let platforms: Vec<u32> = platforms
.into_iter()
.filter(|level| (min_platform_level..=max_platform_level).contains(level))
.collect();

if platforms.is_empty() {
return Err(NdkError::NoPlatformInRange(
min_platform_level,
max_platform_level,
));
}

Ok(Self {
sdk_path,
user_home,
Expand Down
Loading