[release/7.0-rc1] Revert "[MONO] Move marshal-ilgen into a component (#71203)"

src/installer/pkg/sfx/Microsoft.NETCore.App/Directory.Build.props

@@ -205,13 +205,6 @@
     <PlatformManifestFileEntry Include="libmono-component-debugger-stub-static.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libmono-component-debugger-static.lib" IsNative="true" />
     <PlatformManifestFileEntry Include="libmono-component-debugger-stub-static.lib" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmono-component-marshal-ilgen.dll" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmono-component-marshal-ilgen.so" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmono-component-marshal-ilgen.dylib" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmono-component-marshal-ilgen-static.a" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmono-component-marshal-ilgen-stub-static.a" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmono-component-marshal-ilgen-static.lib" IsNative="true" />
-    <PlatformManifestFileEntry Include="libmono-component-marshal-ilgen-stub-static.lib" IsNative="true" />
     <!-- Mono WASM-specific files -->
     <PlatformManifestFileEntry Include="libmono-ee-interp.a" IsNative="true" />
     <PlatformManifestFileEntry Include="libmono-icall-table.a" IsNative="true" />

src/libraries/System.Diagnostics.Tracing/tests/System.Diagnostics.Tracing.Tests.csproj

@@ -6,7 +6,7 @@
     <IncludeRemoteExecutor>true</IncludeRemoteExecutor>
   </PropertyGroup>
   <PropertyGroup>
-    <RuntimeComponents Condition="'$(TargetsAppleMobile)' == 'true' or '$(TargetOS)' == 'Android'">diagnostics_tracing;marshal-ilgen</RuntimeComponents>
+    <RuntimeComponents Condition="'$(TargetsAppleMobile)' == 'true' or '$(TargetOS)' == 'Android'">diagnostics_tracing</RuntimeComponents>
   </PropertyGroup>
   <!-- Windows only files -->
   <ItemGroup Condition="'$(TargetPlatformIdentifier)' == 'windows'">

src/mono/mono.proj

@@ -733,8 +733,7 @@
       <MonoAOTCMakeArgs Include="-DENABLE_ICALL_SYMBOL_MAP=1" />
       <MonoAOTCMakeArgs Include="-DDISABLE_SHARED_LIBS=1" />
       <MonoAOTCMakeArgs Include="-DDISABLE_LIBS=1" />
-      <!-- Link in only the components neeeded for AOT compilation -->
-      <MonoAOTCMakeArgs Include="-DAOT_COMPONENTS=1 -DSTATIC_COMPONENTS=1;" />
+      <MonoAOTCMakeArgs Include="-DDISABLE_COMPONENTS=1" />
       <MonoAOTCMakeArgs Condition="'$(MonoAotOffsetsFile)' != ''" Include="-DAOT_OFFSETS_FILE=&quot;$(MonoAotOffsetsFile)&quot;" />
       <MonoAOTCMakeArgs Condition="'$(MonoAOTEnableLLVM)' == 'true'" Include="-DLLVM_PREFIX=$(MonoAOTLLVMDir.TrimEnd('\/'))" />
       <MonoAOTCMakeArgs Include="$(_MonoAOTCFLAGSOption)" />

src/mono/mono/component/CMakeLists.txt

@@ -6,12 +6,9 @@ set(MONO_EVENTPIPE_GEN_INCLUDE_PATH "${CMAKE_CURRENT_BINARY_DIR}/eventpipe")
 set(MONO_HOT_RELOAD_COMPONENT_NAME "hot_reload")
 set(MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME "diagnostics_tracing")
 set(MONO_DEBUGGER_COMPONENT_NAME "debugger")
-set(MONO_MARSHAL_ILGEN_COMPONENT_NAME "marshal-ilgen")
 
 # a list of every component.
 set(components "")
-# a list of components needed by the AOT compiler
-set(components_for_aot "")
 
 # the sources for each individiable component define a new
 # component_name-sources list for each component, and a
@@ -82,53 +79,17 @@ set(${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-dependencies
   ${MONO_DIAGNOSTICS_TRACING_COMPONENT_NAME}-gen-sources
 )
 
-# marshal-ilgen
-list(APPEND components
-  ${MONO_MARSHAL_ILGEN_COMPONENT_NAME}
-)
-list(APPEND components_for_aot
-  ${MONO_MARSHAL_ILGEN_COMPONENT_NAME}
-)
-
-set(${MONO_MARSHAL_ILGEN_COMPONENT_NAME}-sources
-  ${MONO_COMPONENT_PATH}/marshal-ilgen.c
-  ${MONO_COMPONENT_PATH}/marshal-ilgen.h
-  ${MONO_COMPONENT_PATH}/marshal-ilgen-noilgen.c
-  ${MONO_COMPONENT_PATH}/marshal-ilgen-noilgen.h  
-)
-
-# For every component not build into the AOT compiler, build the stub instead
-set(stubs_for_aot "")
-foreach (component IN LISTS components)
-  if (NOT (component IN_LIST components_for_aot))
-    list(APPEND stubs_for_aot "${component}")
-  endif()
-endforeach()
-
-
-set(${MONO_MARSHAL_ILGEN_COMPONENT_NAME}-stub-sources
-  ${MONO_COMPONENT_PATH}/marshal-ilgen-stub.c
-)
-
-if (AOT_COMPONENTS)
-  set(components_to_build  ${components_for_aot})
-  set(stubs_to_build ${stubs_for_aot})
-else()
-  set(components_to_build  ${components})
-  set(stubs_to_build ${components})
-endif()
-
 # from here down, all the components are treated in the same way
 
 #define a library for each component and component stub
 function(define_component_libs)
   # NOTE: keep library naming pattern in sync with RuntimeComponentManifest.targets
-  if (AOT_COMPONENTS OR NOT DISABLE_LIBS )
-    foreach(component IN LISTS components_to_build)
+  if (NOT DISABLE_LIBS)
+    foreach(component IN LISTS components)
       add_library("mono-component-${component}-static" STATIC $<TARGET_OBJECTS:${component}-objects>)
       install(TARGETS "mono-component-${component}-static" LIBRARY)
     endforeach()
-    foreach(component IN LISTS stubs_to_build)
+    foreach(component IN LISTS components)
       add_library("mono-component-${component}-stub-static" STATIC $<TARGET_OBJECTS:${component}-stub-objects>)
       install(TARGETS "mono-component-${component}-stub-static" LIBRARY)
     endforeach()
@@ -142,7 +103,7 @@ target_sources(component_base INTERFACE
 )
 target_link_libraries(component_base INTERFACE monoapi)
 
-if(NOT AOT_COMPONENTS AND (DISABLE_COMPONENTS OR DISABLE_LIBS))
+if(DISABLE_COMPONENTS OR DISABLE_LIBS)
   set(DISABLE_COMPONENT_OBJECTS 1)
 endif()
 
@@ -162,7 +123,7 @@ endforeach()
 
 if(NOT DISABLE_COMPONENTS AND NOT STATIC_COMPONENTS)
   # define a shared library for each component
-  foreach(component IN LISTS components_to_build)
+  foreach(component IN LISTS components)
     # NOTE: keep library naming pattern in sync with RuntimeComponentManifest.targets
     if(HOST_WIN32)
       add_library("mono-component-${component}" SHARED "${${component}-sources}")
@@ -194,14 +155,14 @@ if(NOT DISABLE_COMPONENTS AND NOT STATIC_COMPONENTS)
   #define a library for each component and component stub
   define_component_libs()
 
-elseif(AOT_COMPONENTS OR (NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS))
+elseif(NOT DISABLE_COMPONENTS AND STATIC_COMPONENTS)
 
   #define a library for each component and component stub
   define_component_libs()
 
   # define a list of mono-components objects for mini if building a shared libmono with static-linked components
   set(mono-components-objects "")
-  foreach(component IN LISTS components_to_build)
+  foreach(component IN LISTS components)
     list(APPEND mono-components-objects $<TARGET_OBJECTS:${component}-objects>)
   endforeach()