Skip to content

Commit 36a8933

Browse files
committed
Use the new libcoreclr_static.a library
1 parent 33515b0 commit 36a8933

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/Xamarin.Android.Build.Tasks/Tasks/GetNativeRuntimeComponents.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -167,7 +167,9 @@ void HackMakeArchiveItem (NativeRuntimeComponents.Archive archive, List<ITaskIte
167167
string commonClrObjDir = Path.Combine ("artifacts", "obj", "coreclr");
168168
const string config = "Release";
169169

170-
if (IsArchive ("libcoreclr.a")) {
170+
if (IsArchive ("libcoreclr_static.a")) {
171+
MakeRelativeArtifactPaths ((string clrArch) => Path.Combine ("artifacts", "bin", "coreclr", $"android.{clrArch}.{config}"));
172+
} else if (IsArchive ("libcoreclr.a")) {
171173
archiveName = "libcoreclr_static.a";
172174
MakeRelativeArtifactPaths ((string clrArch) => Path.Combine (commonClrObjDir, $"android.{clrArch}.{config}", "dlls", "mscoree", "coreclr"));
173175
} else if (IsArchive ("libcoreclrpal.a")) {

src/Xamarin.Android.Build.Tasks/Utilities/NativeRuntimeComponents.cs

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -93,17 +93,17 @@ public NativeRuntimeComponents (ITaskItem[]? monoComponents)
9393
this.monoComponents = monoComponents;
9494
KnownArchives = new () {
9595
// CoreCLR runtime + BCL
96-
new ClrArchive ("libcoreclr.a"),
97-
new ClrArchive ("libcoreclrminipal.a"),
98-
new ClrArchive ("libgc_pal.a"),
99-
100-
new ClrArchive ("libcoreclrpal.a", wholeArchive: true),
101-
new ClrArchive ("libeventprovider.a"),
102-
new ClrArchive ("libnativeresourcestring.a"),
103-
new ClrArchive ("libminipal.a"),
104-
new ClrArchive ("libbrotlicommon.a"),
96+
new ClrArchive ("libcoreclr_static.a"),
97+
// new ClrArchive ("libcoreclrminipal.a"),
98+
// new ClrArchive ("libgc_pal.a"),
99+
100+
// new ClrArchive ("libcoreclrpal.a", wholeArchive: true),
101+
// new ClrArchive ("libeventprovider.a"),
102+
// new ClrArchive ("libnativeresourcestring.a"),
103+
// new ClrArchive ("libminipal.a")
104+
new ClrArchive ("libbrotlienc.a"),,
105105
new ClrArchive ("libbrotlidec.a"),
106-
new ClrArchive ("libbrotlienc.a"),
106+
new ClrArchive ("libbrotlicommon.a"),
107107

108108
new BclArchive ("libSystem.Globalization.Native.a"),
109109
new BclArchive ("libSystem.IO.Compression.Native.a"),

0 commit comments

Comments
 (0)