Skip to content
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

[monodroid] AndroidEnablePreloadAssemblies causes runtime crash. #5883

Merged
merged 2 commits into from
Apr 30, 2021
Merged

[monodroid] AndroidEnablePreloadAssemblies causes runtime crash. #5883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a77aa03
[monodroid] `AndroidEnablePreloadAssemblies` causes runtime crash.
dellis1972 Apr 28, 2021
3140ebe
Add Unit Test
dellis1972 Apr 30, 2021
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
2 changes: 1 addition & 1 deletion src/monodroid/jni/monodroid-glue-internal.hh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -224,7 +224,7 @@ namespace xamarin::android::internal
void disable_external_signal_handlers ();
void lookup_bridge_info (MonoDomain *domain, MonoImage *image, const OSBridge::MonoJavaGCBridgeType *type, OSBridge::MonoJavaGCBridgeInfo *info);
void load_assembly (MonoDomain *domain, jstring_wrapper &assembly);
void load_assemblies (MonoDomain *domain, jstring_array_wrapper &assemblies);
void load_assemblies (MonoDomain *domain, bool preload, jstring_array_wrapper &assemblies);
void set_debug_options ();
void parse_gdb_options ();
void mono_runtime_init (dynamic_local_string<PROPERTY_VALUE_BUFFER_LEN>& runtime_args);
Expand Down
9 changes: 6 additions & 3 deletions src/monodroid/jni/monodroid-glue.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1595,7 +1595,7 @@ MonodroidRuntime::load_assembly (MonoDomain *domain, jstring_wrapper &assembly)
}

inline void
MonodroidRuntime::load_assemblies (MonoDomain *domain, jstring_array_wrapper &assemblies)
MonodroidRuntime::load_assemblies (MonoDomain *domain, bool preload, jstring_array_wrapper &assemblies)
{
timing_period total_time;
if (XA_UNLIKELY (utils.should_log (LOG_TIMING)))
Expand All @@ -1604,6 +1604,9 @@ MonodroidRuntime::load_assemblies (MonoDomain *domain, jstring_array_wrapper &as
for (size_t i = 0; i < assemblies.get_length (); ++i) {
jstring_wrapper &assembly = assemblies [i];
load_assembly (domain, assembly);
// only load the first "main" assembly if we are not preloading.
if (!preload)
break;
}

if (XA_UNLIKELY (utils.should_log (LOG_TIMING))) {
Expand Down Expand Up @@ -1638,8 +1641,8 @@ MonodroidRuntime::create_and_initialize_domain (JNIEnv* env, jclass runtimeClass
if (assembliesBytes != nullptr)
designerAssemblies.add_or_update_from_java (domain, env, assemblies, assembliesBytes, assembliesPaths);
#endif
if (androidSystem.is_assembly_preload_enabled () || (is_running_on_desktop && force_preload_assemblies))
load_assemblies (domain, assemblies);
bool preload = (androidSystem.is_assembly_preload_enabled () || (is_running_on_desktop && force_preload_assemblies));
load_assemblies (domain, preload, assemblies);
init_android_runtime (domain, env, runtimeClass, loader);

osBridge.add_monodroid_domain (domain);
Expand Down
3 changes: 2 additions & 1 deletion tests/MSBuildDeviceIntegration/Tests/DebuggingTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ public void ApplicationRunsWithoutDebugger ([Values (false, true)] bool isReleas
}

[Test]
public void ClassLibraryMainLauncherRuns ()
public void ClassLibraryMainLauncherRuns ([Values (true, false)] bool preloadAssemblies)
{
AssertHasDevices ();

Expand All @@ -85,6 +85,7 @@ public void ClassLibraryMainLauncherRuns ()
app.SetAndroidSupportedAbis ("armeabi-v7a", "x86");
}
app.SetDefaultTargetDevice ();
app.SetProperty ("AndroidEnablePreloadAssemblies", preloadAssemblies.ToString ());

var lib = new XamarinAndroidLibraryProject {
ProjectName = "MyLibrary"
Expand Down