Skip to content

[Xamarin.Android.Build.Tasks] <GenerateJavaStubs/> should open readonly in some cases #8129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jun 14, 2023
Merged

[Xamarin.Android.Build.Tasks] <GenerateJavaStubs/> should open readonly in some cases #8129

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 9 additions & 7 deletions src/Xamarin.Android.Build.Tasks/Tasks/GenerateJavaStubs.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -100,10 +100,11 @@ public class GenerateJavaStubs : AndroidTask
public override bool RunTask ()
{
try {
bool useMarshalMethods = !Debug && EnableMarshalMethods;
// We're going to do 3 steps here instead of separate tasks so
// we can share the list of JLO TypeDefinitions between them
using (DirectoryAssemblyResolver res = MakeResolver ()) {
Run (res, useMarshalMethods: !Debug && EnableMarshalMethods);
using (DirectoryAssemblyResolver res = MakeResolver (useMarshalMethods)) {
Run (res, useMarshalMethods);
}
} catch (XamarinAndroidException e) {
Log.LogCodedError (string.Format ("XA{0:0000}", e.Code), e.MessageWithoutCode);
Expand All @@ -121,12 +122,13 @@ public override bool RunTask ()
return !Log.HasLoggedErrors;
}

DirectoryAssemblyResolver MakeResolver ()
DirectoryAssemblyResolver MakeResolver (bool useMarshalMethods)
{
var readerParams = new ReaderParameters {
ReadWrite = true,
InMemory = true,
};
var readerParams = new ReaderParameters();
if (useMarshalMethods) {
readerParams.ReadWrite = true;
readerParams.InMemory = true;
}

var res = new DirectoryAssemblyResolver (this.CreateTaskLogger (), loadDebugSymbols: true, loadReaderParameters: readerParams);
foreach (var dir in FrameworkDirectories) {
Expand Down