Update NDK to r22 #5475

grendello · 2021-01-07T20:41:01Z

The most important NDK changes:

GNU binutils are deprecated (but still used)
LLVM 11 is used for the toolchain

XA changes:

All the binutils tools are listed in a single location, Configurables.Defaults, now
Host NDK binutils are installed by xaprepare instead of by Xamarin.Android.Build.Tools
UBSAN checked builds require RTTI and exceptions now

radekdoulik · 2021-01-08T11:13:59Z

src/monodroid/CMakeLists.txt

-check_include_file_cxx("linux/if_arp.h" HAVE_LINUX_IF_ARP_H)
+check_include_file("linux/netlink.h" HAVE_LINUX_NETLINK_H)
+check_include_file("linux/rtnetlink.h" HAVE_LINUX_RTNETLINK_H)
+check_include_file("linux/if_arp.h" HAVE_LINUX_IF_ARP_H) 


Just a nitpick, excessive space.

radekdoulik

LGTM once green.

radekdoulik · 2021-01-08T11:26:24Z

Looks like it is now failing with:

CMake Error at CMakeLists.txt:85 (message):
  Please set the MINGW_DEPENDENCIES_ROOT_DIR variable on command line
  (-DMINGW_DEPENDENCIES_ROOT_DIR=PATH)
   Called from: [1]	C:/a/1/s/src/monodroid/CMakeLists.txt

grendello · 2021-01-08T13:50:54Z

There's also the cmake policy warning which is treated as an error on Windows (dunno why). I'm about to look into those issues

build-tools/xaprepare/xaprepare/Steps/Step_Get_Windows_Binutils.cs

jonpryor · 2021-01-14T19:31:24Z

We may need to hold off on this PR? There are lots of failing unit tests a'la https://devdiv.visualstudio.com/DevDiv/_build/results?buildId=4360715&view=ms.vss-test-web.build-test-results-tab&runId=18012466&resultId=100080&paneView=attachments

Should have no MSBuild warnings.
Expected: True
But was:  False

…/BuildHasNoWarningsFalseTrueTrueapk/Properties/AndroidManifest.xml :
warning XA4216: AndroidManifest.xml //uses-sdk/@android:minSdkVersion '19' is less than API-21, this configuration is not supported.

It appears that NDK r22 bumps the minSdkVersion value to API-21 -- likely because it no longer has a platforms/android-19 directory -- which introducing all these warnings.

I thus fear that we can't really bump to NDK r22 until we bump our minimum to API-21…which is where things get complicated. .NET 6 will have API-21 as a minimum, but we plan on concurrently shipping "legacy" installers for some period of overlapping time, and both the "legacy" and .NET 6 installers will be coming out of this repo.

How do we sanely support that?

grendello · 2021-01-14T21:15:35Z

We also need to wait for NDK to be fixed for us before we can switch. Regarding supporting both net6 and "legacy", the only option would be to enable building with both r21 and r22 - probably different pipelines running in parallel. It will definitely require some thought and work. I'm going to leave this PR open as a draft and we can come back to it when NDK is fixed. In the meantime we can discuss how to solve the net6 vs legacy conundrum.

grendello · 2021-01-29T17:08:34Z

Most of the issues are fixed, there's only one of AOT + LLVM. Since NDK r22 removed $arch-ld replacing it with $arch-ld.{bfd,gold}, Mono is not able to link the AOT-d code since it hardcodes ld as the linker name :( If @marek-safar and @lambdageek OK it, I will next work on fixing that bit in Mono next week.

Context: https://github.com/android/ndk/wiki/Changelog-r22#announcements Context: dotnet/android#5475 This commit fixes a problem where the AOT compiler hard-codes the native linker executable name to a platform-specific value but such an executable does not exist in the toolchain being used, thus making the AOT compiler fail to link the final binary. The specific use case here is the new Android NDK r22 which not only deprecates GNU binutils, but also removes architecture-prefixed `ld` binary (e.g. `aarch64-linux-android-ld` no longer exists). Instead, the NDK provides a non-prefixed `ld` binary and two prefixed ones: `$arch-ld.gold` and `$arch-ld.bfd`. However, since the AOT compiler hardcodes `ld` as the linker name on Linux systems, the AOT compilation fails when attempting to link the final executable. Which, in turn, breaks some Xamarin.Android AOT tests. This commit fixes the issue by adding a new `ld-name` option to the AOT compiler allowing one to specify just the name of the linker binary to use. The rest of the toolchain mechanics doesn't change.

grendello · 2021-02-02T09:17:59Z

I fixed all AOT failures, but they won't work in this PR until mono/mono#20816 is in and we can update Mono to one with the fix.

Context: https://github.com/android/ndk/wiki/Changelog-r22#announcements Context: dotnet/android#5475 Context: mono/mono#20814 This commit fixes a problem where the AOT compiler hard-codes the native linker executable name to a platform-specific value but such an executable does not exist in the toolchain being used, thus making the AOT compiler fail to link the final binary. The specific use case here is the new Android NDK r22 which not only deprecates GNU binutils, but also removes architecture-prefixed `ld` binary (e.g. `aarch64-linux-android-ld` no longer exists). Instead, the NDK provides a non-prefixed `ld` binary and two prefixed ones: `$arch-ld.gold` and `$arch-ld.bfd`. However, since the AOT compiler hardcodes `ld` as the linker name on Linux systems, the AOT compilation fails when attempting to link the final executable. Which, in turn, breaks some Xamarin.Android AOT tests. This commit fixes the issue by adding a new `ld-name` option to the AOT compiler allowing one to specify just the name of the linker binary to use. The rest of the toolchain mechanics doesn't change.

Context: https://github.com/android/ndk/wiki/Changelog-r22#announcements Context: dotnet/android#5475 This commit fixes a problem where the AOT compiler hard-codes the native linker executable name to a platform-specific value but such an executable does not exist in the toolchain being used, thus making the AOT compiler fail to link the final binary. The specific use case here is the new Android NDK r22 which not only deprecates GNU binutils, but also removes architecture-prefixed `ld` binary (e.g. `aarch64-linux-android-ld` no longer exists). Instead, the NDK provides a non-prefixed `ld` binary and two prefixed ones: `$arch-ld.gold` and `$arch-ld.bfd`. However, since the AOT compiler hardcodes `ld` as the linker name on Linux systems, the AOT compilation fails when attempting to link the final executable. Which, in turn, breaks some Xamarin.Android AOT tests. This commit fixes the issue by adding a new `ld-name` option to the AOT compiler allowing one to specify just the name of the linker binary to use. The rest of the toolchain mechanics doesn't change.

Context: https://github.com/android/ndk/wiki/Changelog-r22#announcements Context: dotnet/android#5475 Context: mono/mono#20814 This commit fixes a problem where the AOT compiler hard-codes the native linker executable name to a platform-specific value but such an executable does not exist in the toolchain being used, thus making the AOT compiler fail to link the final binary. The specific use case here is the new Android NDK r22 which not only deprecates GNU binutils, but also removes architecture-prefixed `ld` binary (e.g. `aarch64-linux-android-ld` no longer exists). Instead, the NDK provides a non-prefixed `ld` binary and two prefixed ones: `$arch-ld.gold` and `$arch-ld.bfd`. However, since the AOT compiler hardcodes `ld` as the linker name on Linux systems, the AOT compilation fails when attempting to link the final executable. Which, in turn, breaks some Xamarin.Android AOT tests. This commit fixes the issue by adding a new `ld-name` option to the AOT compiler allowing one to specify just the name of the linker binary to use. The rest of the toolchain mechanics doesn't change.

grendello · 2021-02-04T15:10:47Z

We are ready for NDK r22 :) Now we need to wait for new NDK release which fixes the detection issue

Context: https://github.com/android/ndk/wiki/Changelog-r22 The most important NDK changes: * GNU binutils are deprecated (but still used) * LLVM 11 is used for the toolchain * LLD is now the default linker XA changes: * All the binutils tools are listed in a single location, `Configurables.Defaults`, now * Host NDK binutils are installed by xaprepare instead of by Xamarin.Android.Build.Tools * `UBSAN` checked builds require `RTTI` and exceptions now

grendello force-pushed the ndk-update branch 2 times, most recently from 1eab28b to 130d5c9 Compare January 8, 2021 10:30

grendello marked this pull request as ready for review January 8, 2021 10:30

grendello requested review from dellis1972, jonathanpeppers and jonpryor as code owners January 8, 2021 10:30

grendello requested a review from radekdoulik January 8, 2021 10:30

radekdoulik reviewed Jan 8, 2021

View reviewed changes

radekdoulik approved these changes Jan 8, 2021

View reviewed changes

grendello force-pushed the ndk-update branch from 130d5c9 to 0317a5e Compare January 8, 2021 17:17

jonpryor reviewed Jan 8, 2021

View reviewed changes

build-tools/xaprepare/xaprepare/Steps/Step_Get_Windows_Binutils.cs Show resolved Hide resolved

jonpryor reviewed Jan 8, 2021

View reviewed changes

build-tools/xaprepare/xaprepare/Steps/Step_Get_Windows_Binutils.cs Show resolved Hide resolved

grendello force-pushed the ndk-update branch from 0317a5e to 5d006e5 Compare January 11, 2021 09:15

grendello mentioned this pull request Jan 11, 2021

[BUG] r22 appears to break cmake compiler and OS detection on Windows android/ndk#1427

Closed

grendello marked this pull request as draft January 14, 2021 21:16

grendello added the do-not-merge PR should not be merged. label Jan 14, 2021

grendello mentioned this pull request Jan 15, 2021

Xamarin.Android can't find NDK bundle include folder when using latest NDK #5499

Closed

grendello force-pushed the ndk-update branch 5 times, most recently from a062261 to 5d2debd Compare January 26, 2021 22:01

grendello force-pushed the ndk-update branch 4 times, most recently from 4732d9a to 2c5aba3 Compare January 29, 2021 11:19

grendello force-pushed the ndk-update branch from 2c5aba3 to 28d6492 Compare January 29, 2021 17:06

grendello mentioned this pull request Feb 2, 2021

[AOT] Make native linker name configurable mono/mono#20814

Merged

grendello mentioned this pull request Feb 2, 2021

[AOT] Make native linker name configurable mono/mono#20815

Closed

grendello force-pushed the ndk-update branch from 28d6492 to 57f003c Compare February 2, 2021 09:14

grendello mentioned this pull request Feb 2, 2021

[AOT] Make native linker name configurable mono/mono#20816

Merged

grendello mentioned this pull request Feb 2, 2021

[AOT] Make native linker name configurable dotnet/runtime#47747

Merged

grendello force-pushed the ndk-update branch from 57f003c to 1dde31a Compare February 3, 2021 08:23

grendello force-pushed the ndk-update branch 5 times, most recently from d35ac3c to 05c942e Compare February 4, 2021 11:56

grendello marked this pull request as ready for review February 4, 2021 15:10

grendello force-pushed the ndk-update branch 2 times, most recently from e3f849d to 43fb082 Compare February 8, 2021 09:09

grendello removed the do-not-merge PR should not be merged. label Feb 8, 2021

grendello force-pushed the ndk-update branch from 43fb082 to 759c1dd Compare February 8, 2021 14:48

jonpryor merged commit accc846 into dotnet:master Feb 9, 2021

grendello deleted the ndk-update branch February 9, 2021 20:00

github-actions bot locked and limited conversation to collaborators Jan 26, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Update NDK to r22 #5475

Update NDK to r22 #5475

grendello commented Jan 7, 2021 •

edited

Loading

radekdoulik Jan 8, 2021

radekdoulik left a comment

radekdoulik commented Jan 8, 2021

grendello commented Jan 8, 2021

jonpryor commented Jan 14, 2021

grendello commented Jan 14, 2021

grendello commented Jan 29, 2021

grendello commented Feb 2, 2021

grendello commented Feb 4, 2021

Update NDK to r22 #5475

Update NDK to r22 #5475

Conversation

grendello commented Jan 7, 2021 • edited Loading

radekdoulik Jan 8, 2021

Choose a reason for hiding this comment

radekdoulik left a comment

Choose a reason for hiding this comment

radekdoulik commented Jan 8, 2021

grendello commented Jan 8, 2021

jonpryor commented Jan 14, 2021

grendello commented Jan 14, 2021

grendello commented Jan 29, 2021

grendello commented Feb 2, 2021

grendello commented Feb 4, 2021

grendello commented Jan 7, 2021 •

edited

Loading