mirror of
https://github.com/focus-creative-games/hybridclr_unity.git
synced 2026-11-19 14:52:41 +08:00
fix: generate an empty method bridge and reverse PInvoke wrapper before generating aot dlls because some build targets will link the generated AOT dll
This commit is contained in:
@@ -843,7 +843,7 @@ namespace HybridCLR.CodeGen.MethodBridge
|
||||
|
||||
private void CollectStructDefs(List<MethodSig> methods, HashSet<TypeInfo> structTypes)
|
||||
{
|
||||
ICorLibTypes corLibTypes = _genericMethods[0].Method.Module.CorLibTypes;
|
||||
ICorLibTypes corLibTypes = _genericMethods.Count > 0 ? _genericMethods[0].Method.Module.CorLibTypes : null;
|
||||
|
||||
foreach (var method in methods)
|
||||
{
|
||||
|
||||
@@ -55,6 +55,12 @@ namespace HybridCLR.Commands
|
||||
GenerateMethodBridgeAndReversePInvokeWrapper(target);
|
||||
}
|
||||
|
||||
public static void GenerateEmptyMethodBridgeAndReversePInvokeWrapper(BuildTarget target)
|
||||
{
|
||||
string outputFile = $"{SettingsUtil.GeneratedCppDir}/MethodBridge.inc";
|
||||
GenerateMethodBridgeCppFile(new List<GenericMethod>(), new List<RawMonoPInvokeCallbackMethodInfo>(), new List<CallNativeMethodSignatureInfo>(), outputFile);
|
||||
}
|
||||
|
||||
public static void GenerateMethodBridgeAndReversePInvokeWrapper(BuildTarget target)
|
||||
{
|
||||
string aotDllDir = SettingsUtil.GetAssembliesPostIl2CppStripDir(target);
|
||||
|
||||
@@ -43,6 +43,11 @@ namespace HybridCLR.Commands
|
||||
// These generation depend on HotUpdateDlls
|
||||
LinkGeneratorCommand.GenerateLinkXml(target);
|
||||
|
||||
// Because some build targets will link the generated AOT dll before generating method bridge,
|
||||
// so we need to generate an empty method bridge and reverse PInvoke wrapper first
|
||||
// so that the generated AOT dll can be linked successfully
|
||||
MethodBridgeGeneratorCommand.GenerateEmptyMethodBridgeAndReversePInvokeWrapper(target);
|
||||
|
||||
// Generate stripped aot dll
|
||||
StripAOTDllCommand.GenerateStripedAOTDlls(target);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user