Skip to content

Commit

Permalink
Bump to r25-beta2
Browse files Browse the repository at this point in the history
  • Loading branch information
grendello committed Mar 18, 2022
1 parent fbbeff7 commit 96cae1c
Showing 1 changed file with 0 additions and 6 deletions.
6 changes: 0 additions & 6 deletions src/Xamarin.Android.Build.Tasks/Tasks/GetAotArguments.cs
Original file line number Diff line number Diff line change
Expand Up @@ -137,17 +137,13 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)
int level;
if (manifest?.MinSdkVersion != null) {
level = manifest.MinSdkVersion.Value;
Log.LogDebugMessage ($"NDK API level read from manifest");
} else if (int.TryParse (MinimumSupportedApiLevel, out level)) {
Log.LogDebugMessage ("NDK API level taken from MinimumSupportedApiLevel");
// level already set
} else if (int.TryParse (AndroidApiLevel, out level)) {
Log.LogDebugMessage ("NDK API level taken from AndroidApiLevel");
// level already set
} else {
// Probably not ideal!
level = MonoAndroidHelper.SupportedVersions.MaxStableVersion.ApiLevel;
Log.LogDebugMessage ("NDK API level taken from MonoAndroidHelper.SupportedVersions.MaxStableVersion.ApiLevel");
}

// Some Android API levels do not exist on the NDK level. Workaround this my mapping them to the
Expand All @@ -161,7 +157,6 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)

// API levels below level 21 do not provide support for 64-bit architectures.
if (ndk.IsNdk64BitArch (arch) && level < 21) {
Log.LogDebugMessage ("NDK API level raised to 21, required for 64-bit support");
level = 21;
}

Expand All @@ -177,7 +172,6 @@ int GetNdkApiLevel (NdkTools ndk, AndroidTargetArch arch)
}
}

Log.LogDebugMessage ($"Using NDK API level {level}");
return level;
}

Expand Down

0 comments on commit 96cae1c

Please sign in to comment.