Skip to content
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
Prev Previous commit
Next Next commit
Revert "WIP Leverage monovm_initialize_preparsed"
This reverts commit 1edaeee.
  • Loading branch information
mdh1418 committed Aug 25, 2022
commit 32451c8133595d40d9aaf1a24c92a2a4a4d71129
2 changes: 0 additions & 2 deletions src/mono/mono/mini/monovm.c
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ static MonoCoreTrustedPlatformAssemblies *trusted_platform_assemblies;
static MonoCoreLookupPaths *native_lib_paths;
static MonoCoreLookupPaths *app_paths;
static MonoCoreLookupPaths *platform_resource_roots;
static MonoCoreLocalTime *local_time;

static void
mono_core_trusted_platform_assemblies_free (MonoCoreTrustedPlatformAssemblies *a)
Expand Down Expand Up @@ -221,7 +220,6 @@ monovm_initialize_preparsed (MonoCoreRuntimeProperties *parsed_properties, int p
trusted_platform_assemblies = parsed_properties->trusted_platform_assemblies;
app_paths = parsed_properties->app_paths;
native_lib_paths = parsed_properties->native_dll_search_directories;
local_time = parsed_properties->local_time;
mono_loader_install_pinvoke_override (parsed_properties->pinvoke_override);

finish_initialization ();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,10 @@ typedef struct {
char **dirs;
} MonoCoreLookupPaths;

typedef struct {
uint64_t current_local_time;
} MonoCoreLocalTime;

typedef struct {
MonoCoreTrustedPlatformAssemblies *trusted_platform_assemblies;
MonoCoreLookupPaths *app_paths;
MonoCoreLookupPaths *native_dll_search_directories;
MonoCoreLocalTime *local_time;
PInvokeOverrideFn pinvoke_override;
} MonoCoreRuntimeProperties;

Expand Down
9 changes: 1 addition & 8 deletions src/tasks/AndroidAppBuilder/Templates/monodroid.c
Original file line number Diff line number Diff line change
Expand Up @@ -237,13 +237,6 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
snprintf (local_date_time_offset_buffer, sizeof(local_date_time_offset_buffer), "%d", local_date_time_offset);
appctx_values[2] = strdup (local_date_time_offset_buffer);

MonoCoreLocalTime mclt = {
local_date_time_offset,
};
MonoCoreRuntimeProperties mcrp = {
&mclt,
};

char *file_name = RUNTIMECONFIG_BIN_FILE;
int str_len = strlen (bundle_path) + strlen (file_name) + 1; // +1 is for the "/"
char *file_path = (char *)malloc (sizeof (char) * (str_len +1)); // +1 is for the terminating null character
Expand All @@ -262,7 +255,7 @@ mono_droid_runtime_init (const char* executable, int managed_argc, char* managed
free (file_path);
}

monovm_initialize_preparsed(&mcrp, 3, appctx_keys, appctx_values);
monovm_initialize(3, appctx_keys, appctx_values);

mono_debug_init (MONO_DEBUG_FORMAT_MONO);
mono_install_assembly_preload_hook (mono_droid_assembly_preload_hook, NULL);
Expand Down