[mono][librarymode] Bundle runtimeconfig.bin

mdh1418 · mdh1418 · commit 90842349b354 · 2023-04-03T17:30:16.000-04:00
diff --git a/src/mono/msbuild/android/build/AndroidBuild.targets b/src/mono/msbuild/android/build/AndroidBuild.targets
@@ -247,7 +247,8 @@
   <Target Name="_AndroidGenerateRuntimeConfig"
           Inputs="$(_AndroidRuntimeConfigFilePath)"
           Outputs="$(_ParsedRuntimeConfigFilePath)"
-          Condition="Exists('$(_AndroidRuntimeConfigFilePath)')">
+          Condition="Exists('$(_AndroidRuntimeConfigFilePath)')"
+          BeforeTargets="_GenerateBundle">
     <ItemGroup>
       <_RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
       <_RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
diff --git a/src/mono/msbuild/apple/build/AppleBuild.targets b/src/mono/msbuild/apple/build/AppleBuild.targets
@@ -274,7 +274,8 @@
   <Target Name="_AppleGenerateRuntimeConfig"
           Inputs="$(_AppleRuntimeConfigFilePath)"
           Outputs="$(_ParsedRuntimeConfigFilePath)"
-          Condition="Exists('$(_AppleRuntimeConfigFilePath)')">
+          Condition="Exists('$(_AppleRuntimeConfigFilePath)')"
+          BeforeTargets="_GenerateBundle">
     <ItemGroup>
       <_RuntimeConfigReservedProperties Include="RUNTIME_IDENTIFIER"/>
       <_RuntimeConfigReservedProperties Include="APP_CONTEXT_BASE_DIRECTORY"/>
diff --git a/src/mono/msbuild/common/LibraryBuilder.targets b/src/mono/msbuild/common/LibraryBuilder.targets
@@ -51,6 +51,7 @@
     <ItemGroup>
       <_AssembliesToBundle Remove="@(_AssembliesToBundle)" />
       <_AssembliesToBundle Include="@(_AssembliesToBundleInternal)" />
+      <_AssembliesToBundle Include="$(_ParsedRuntimeConfigFilePath)" />
     </ItemGroup>
 
     <GetFileHash Files="@(_AssembliesToBundle)">
diff --git a/src/tasks/LibraryBuilder/Templates/autoinit.c b/src/tasks/LibraryBuilder/Templates/autoinit.c
@@ -18,6 +18,33 @@
 
 #include "library-builder.h"
 
+#if defined(BUNDLED_ASSEMBLIES)
+
+static void
+cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
+{
+    free (args);
+    free (user_data);
+}
+
+static void
+initialize_runtimeconfig ()
+{
+    MonovmRuntimeConfigArguments *arg = (MonovmRuntimeConfigArguments *)malloc (sizeof (MonovmRuntimeConfigArguments));
+    if (!arg)
+        LOG_ERROR ("Out of memory.\n");
+
+    arg->kind = 1;
+    const char *data;
+    int data_len;
+    mono_get_bundled_assembly ("runtimeconfig.bin", &data, &data_len);
+    arg->runtimeconfig.data.data = data;
+    arg->runtimeconfig.data.data_len = data_len;
+    monovm_runtimeconfig_initialize (arg, cleanup_runtime_config, NULL);
+}
+
+#else
+
 static void
 cleanup_runtime_config (MonovmRuntimeConfigArguments *args, void *user_data)
 {
@@ -54,6 +81,8 @@ initialize_runtimeconfig (const char *bundle_path)
     }
 }
 
+#endif // BUNDLED_ASSEMBLIES
+
 static void
 initialize_appctx_env_variables (const char *bundle_path)
 {
@@ -110,6 +139,13 @@ free_aot_data (MonoAssembly *assembly, int size, void *user_data, void *handle)
 static void
 runtime_init_callback ()
 {
+    register_aot_modules ();
+
+#if defined(BUNDLED_ASSEMBLIES)
+    mono_register_assemblies_bundle ();
+    mono_register_bundle ();
+#endif
+
     const char *assemblies_location = getenv ("%ASSEMBLIES_LOCATION%");
     if (!assemblies_location || assemblies_location[0] == '\0')
         assemblies_location = "./";
@@ -123,13 +159,6 @@ runtime_init_callback ()
 
     initialize_appctx_env_variables (bundle_path);
 
-    register_aot_modules ();
-
-#if defined(BUNDLED_ASSEMBLIES)
-    mono_register_assemblies_bundle ();
-    mono_register_bundle ();
-#endif
-
     mono_set_assemblies_path (bundle_path);
 
     mono_jit_set_aot_only (true);
diff --git a/src/tasks/LibraryBuilder/Templates/library-builder.h b/src/tasks/LibraryBuilder/Templates/library-builder.h
@@ -37,6 +37,7 @@
 
 void register_aot_modules (void);
 #if defined(BUNDLED_ASSEMBLIES)
+void mono_get_bundled_assembly (const char *name, const unsigned char **out_data, unsigned int *out_size);
 void mono_register_assemblies_bundle (void);
 void mono_register_bundle (void);
 #endif // BUNDLED_ASSEMBLIES
