forked from dotnet/android
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Bump to mono/mono@c66141a8; NDK r22 support (dotnet#5475)
Context: mono/mono#20606 Context: https://github.com/android/ndk/wiki/Changelog-r22 Changes: mono/mono@5e9cb6d...c66141a * mono/mono@c66141a8c7b: [AOT] Make native linker name configurable (#20816) * mono/mono@64368a00d85: Bump msbuild * mono/mono@364c87b1a7a: Disable acceptance-tests/roslyn.mk * mono/mono@9b139294c04: Bump msbuild to fix build break * mono/mono@b9c050faf2e: [aot] Quote the -Wl,install_name argument to clang. (#20660) Add support for using [NDK r22][0] when building Xamarin.Android apps. 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 Mono changes: * Allow the `ld` name to be configurable, as we now prefer e.g. `aarch64-linux-android-ld.gold`, not `aarch64-linux-android-ld`, as the latter is LLD and not binutils. Xamarin.Android CI changes: * All the binutils tools are listed in a single location, within `xaprepare`'s `Configurables.Defaults`. * Host NDK binutils are installed by `xaprepare` instead of by Xamarin.Android.Build.Tools * `UBSAN` checked builds now require `RTTI` and exceptions. Xamarin.Android App build changes: * The `<Aot/>` task now supports using NDK r22 TODO: * Add a nightly job (916d24b) which builds Xamarin.Android apps against NDK r21, to ensure we don't break support. * NDK r22's [`cmake` doesn't work on Windows][1]. We have worked around this by copying the fixed `android.toolchain.cmake` as `src-ThirdParty/ndk/android.toolchain.cmake.ndk_r21.3`. Once NDK r22 properly includes the fix, we should remove `src-ThirdParty/ndk/android.toolchain.cmake.ndk_r21.3`. [0]: https://github.com/android/ndk/wiki/Changelog-r22 [1]: android/ndk#1427
- Loading branch information
Showing
24 changed files
with
1,084 additions
and
147 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,2 +1,2 @@ | ||
xamarin/monodroid:main@7da768cf9ddbd137bbce5326dab79b139bcc59e0 | ||
mono/mono:2020-02@5e9cb6d1c1de430965312927d5aed7fcb27bfa73 | ||
mono/mono:2020-02@c66141a8c7ba2566c578c2dd012b2b723e006213 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,9 +1,3 @@ | ||
if((CMAKE_VERSION_MAJOR EQUAL 3 AND CMAKE_VERSION_MINOR GREATER_EQUAL 7) OR CMAKE_VERSION_MAJOR GREATER 3) | ||
set(CMAKE_POLICY_DEFAULT_CMP0066 NEW) | ||
endif() | ||
|
||
if((CMAKE_VERSION_MAJOR EQUAL 3 AND CMAKE_VERSION_MINOR GREATER_EQUAL 8) OR CMAKE_VERSION_MAJOR GREATER 3) | ||
set(CMAKE_POLICY_DEFAULT_CMP0067 NEW) | ||
endif() | ||
|
||
set(CMAKE_POLICY_DEFAULT_CMP0066 NEW) | ||
set(CMAKE_POLICY_DEFAULT_CMP0067 NEW) | ||
set(CMAKE_OSX_DEPLOYMENT_TARGET 10.12) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,22 @@ | ||
using System; | ||
|
||
namespace Xamarin.Android.Prepare | ||
{ | ||
class NDKTool | ||
{ | ||
public string Name { get; } | ||
public string DestinationName { get; } = String.Empty; | ||
|
||
public NDKTool (string name, string? destinationName = null) | ||
{ | ||
if (name.Trim ().Length == 0) { | ||
throw new ArgumentException (nameof (name), "must not be empty"); | ||
} | ||
Name = name; | ||
if (String.IsNullOrWhiteSpace (destinationName)) { | ||
return; | ||
} | ||
DestinationName = destinationName!; | ||
} | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.