[Android] Add NdkToolFinder task & Fix up AOT app build #88210
Conversation
Since we bumped to NDK 23, having the aot compiler itself generate shared libraries stopped working. This is due to NDK 23 moving most of the toolchain into a common bin directory. AS was left over in each of these directories as an alias to bin/<triple>-as. This change adds a task to collect all of the important NDK toolchain paths. It also fixes up the aot build when `AOTWithLibraryFiles` is set to true and we want the aot compiler to produce shared libraries.
steveisok
requested review from
radical,
vargaz,
lambdageek,
SamMonoRT and
marek-safar
as code owners
ghost
assigned 
|
/azp run runtime-android |
|
Azure Pipelines successfully started running 1 pipeline(s). |
| : Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ProgramFiles), "Android", "android-sdk", "ndk-bundle"), | ||
| Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Android", "android-sdk", "ndk-bundle"), | ||
| Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.CommonApplicationData), "Android", "android-sdk", "ndk-bundle"), | ||
| @"C:\android-sdk-windows" |
There was a problem hiding this comment.
do we really want to support this path?
There was a problem hiding this comment.
That's what XA checks for as a fallback, so I just lifted it.
| : | ||
| new string[] | ||
| { | ||
| Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.UserProfile), "Library", "Android", "sdk") |
There was a problem hiding this comment.
looks like this just applies to OSX, not Linux so we should add an OS check.
There was a problem hiding this comment.
Is there a default for linux? There does not appear to be one in XA either.
There was a problem hiding this comment.
There isn't, I was thinking about adding an IsOSX check so we don't try this path which will never exist on Linux
| { | ||
| if (Ndk.NdkVersion.Main.Major != 23) | ||
| { | ||
| throw new Exception($"NDK 23 is required. An unsupported NDK version was found ({Ndk.NdkVersion.Main.Major})."); |
There was a problem hiding this comment.
is it really the exact version? not >= ?
There was a problem hiding this comment.
Yes, for now. I'll follow up with more broad support.
There was a problem hiding this comment.
I was referring to how xamarin-android builded their apps. (https://github.com/xamarin/xamarin-android/blob/03c804262b635089d2d7dab5290eef7d00c66ee2/src/Xamarin.Android.Build.Tasks/Microsoft.Android.Sdk/targets/Microsoft.Android.Sdk.Aot.targets#L109-L130)
Since we bumped to NDK 23, having the aot compiler itself generate shared libraries stopped working. This is due to NDK 23 moving most of the toolchain into a common bin directory. AS was left over in each of these directories as an alias to
bin/<triple>-as.This change adds a task to collect all of the important NDK toolchain paths. It also fixes up the aot build when
AOTWithLibraryFilesis set to true and we want the aot compiler to produce shared libraries.