[revert] Revert "[new] HybridCLRSettings新增AOT dll快照目录,由于保存打包时生成的AOT dlls"

This reverts commit 8d0634620a.
main
walon 2023-06-01 11:15:40 +08:00
parent 941bbc723a
commit 97f083f07d
4 changed files with 2 additions and 20 deletions

View File

@ -12,13 +12,6 @@ namespace HybridCLR.Editor.Commands
{ {
public static class StripAOTDllCommand public static class StripAOTDllCommand
{ {
[MenuItem("HybridCLR/CreateAOTDllSnapshot", priority = 201)]
public static void CreateAOTDllSnapshot()
{
BuildTarget target = EditorUserBuildSettings.activeBuildTarget;
BashUtil.CopyDir(SettingsUtil.GetAssembliesPostIl2CppStripDir(target), SettingsUtil.GetAOTAssemblySnapshotDir(target), true);
}
[MenuItem("HybridCLR/Generate/AOTDlls", priority = 105)] [MenuItem("HybridCLR/Generate/AOTDlls", priority = 105)]
public static void GenerateStripedAOTDlls() public static void GenerateStripedAOTDlls()
{ {

View File

@ -19,7 +19,6 @@ namespace HybridCLR.Editor
private SerializedProperty _hotUpdateDllCompileOutputRootDir; private SerializedProperty _hotUpdateDllCompileOutputRootDir;
private SerializedProperty _externalHotUpdateAssembliyDirs; private SerializedProperty _externalHotUpdateAssembliyDirs;
private SerializedProperty _strippedAOTDllOutputRootDir; private SerializedProperty _strippedAOTDllOutputRootDir;
private SerializedProperty _strippedAOTDllSnapshotDir;
private SerializedProperty _patchAOTAssemblies; private SerializedProperty _patchAOTAssemblies;
private SerializedProperty _outputLinkFile; private SerializedProperty _outputLinkFile;
private SerializedProperty _outputAOTGenericReferenceFile; private SerializedProperty _outputAOTGenericReferenceFile;
@ -47,7 +46,6 @@ namespace HybridCLR.Editor
_hotUpdateDllCompileOutputRootDir = _serializedObject.FindProperty("hotUpdateDllCompileOutputRootDir"); _hotUpdateDllCompileOutputRootDir = _serializedObject.FindProperty("hotUpdateDllCompileOutputRootDir");
_externalHotUpdateAssembliyDirs = _serializedObject.FindProperty("externalHotUpdateAssembliyDirs"); _externalHotUpdateAssembliyDirs = _serializedObject.FindProperty("externalHotUpdateAssembliyDirs");
_strippedAOTDllOutputRootDir = _serializedObject.FindProperty("strippedAOTDllOutputRootDir"); _strippedAOTDllOutputRootDir = _serializedObject.FindProperty("strippedAOTDllOutputRootDir");
_strippedAOTDllSnapshotDir = _serializedObject.FindProperty("strippedAOTDllSnapshotDir");
_patchAOTAssemblies = _serializedObject.FindProperty("patchAOTAssemblies"); _patchAOTAssemblies = _serializedObject.FindProperty("patchAOTAssemblies");
_outputLinkFile = _serializedObject.FindProperty("outputLinkFile"); _outputLinkFile = _serializedObject.FindProperty("outputLinkFile");
_outputAOTGenericReferenceFile = _serializedObject.FindProperty("outputAOTGenericReferenceFile"); _outputAOTGenericReferenceFile = _serializedObject.FindProperty("outputAOTGenericReferenceFile");
@ -136,7 +134,6 @@ namespace HybridCLR.Editor
EditorGUILayout.PropertyField(_hotUpdateDllCompileOutputRootDir); EditorGUILayout.PropertyField(_hotUpdateDllCompileOutputRootDir);
EditorGUILayout.PropertyField(_externalHotUpdateAssembliyDirs); EditorGUILayout.PropertyField(_externalHotUpdateAssembliyDirs);
EditorGUILayout.PropertyField(_strippedAOTDllOutputRootDir); EditorGUILayout.PropertyField(_strippedAOTDllOutputRootDir);
EditorGUILayout.PropertyField(_strippedAOTDllSnapshotDir);
EditorGUILayout.PropertyField(_patchAOTAssemblies); EditorGUILayout.PropertyField(_patchAOTAssemblies);
EditorGUILayout.PropertyField(_outputLinkFile); EditorGUILayout.PropertyField(_outputLinkFile);
EditorGUILayout.PropertyField(_outputAOTGenericReferenceFile); EditorGUILayout.PropertyField(_outputAOTGenericReferenceFile);

View File

@ -32,11 +32,8 @@ namespace HybridCLR.Editor
[Header("外部热更新dll搜索路径")] [Header("外部热更新dll搜索路径")]
public string[] externalHotUpdateAssembliyDirs; public string[] externalHotUpdateAssembliyDirs;
[Header("裁减后AOT dll的输出目录")] [Header("裁减后AOT dll输出根目录")]
public string strippedAOTDllOutputRootDir = "HybridCLRData/AOTDllOutput"; public string strippedAOTDllOutputRootDir = "HybridCLRData/AssembliesPostIl2CppStrip";
[Header("裁减后AOT dll的备份目录")]
public string strippedAOTDllSnapshotDir = "HybridCLRData/AOTDllSnapshot";
[Header("补充元数据AOT dlls")] [Header("补充元数据AOT dlls")]
public string[] patchAOTAssemblies; public string[] patchAOTAssemblies;

View File

@ -55,11 +55,6 @@ namespace HybridCLR.Editor
return $"{AssembliesPostIl2CppStripDir}/{target}"; return $"{AssembliesPostIl2CppStripDir}/{target}";
} }
public static string GetAOTAssemblySnapshotDir(BuildTarget target)
{
return $"{HybridCLRSettings.Instance.strippedAOTDllSnapshotDir}/{target}";
}
class AssemblyDefinitionData class AssemblyDefinitionData
{ {
public string name; public string name;