From 97f083f07d4cee523e4f43c149252d2e36c2cf7e Mon Sep 17 00:00:00 2001
From: walon <walon@focus-creative-games.com>
Date: Thu, 1 Jun 2023 11:15:40 +0800
Subject: [PATCH] =?UTF-8?q?[revert]=20Revert=20"[new]=20HybridCLRSettings?=
 =?UTF-8?q?=E6=96=B0=E5=A2=9EAOT=20dll=E5=BF=AB=E7=85=A7=E7=9B=AE=E5=BD=95?=
 =?UTF-8?q?=EF=BC=8C=E7=94=B1=E4=BA=8E=E4=BF=9D=E5=AD=98=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E6=97=B6=E7=94=9F=E6=88=90=E7=9A=84AOT=20dlls"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 8d0634620a4c3a5a24b2903066b998f4f6d53fe1.
---
 Editor/Commands/StripAOTDllCommand.cs       | 7 -------
 Editor/Settings/HybridCLRSettingProvider.cs | 3 ---
 Editor/Settings/HybridCLRSettings.cs        | 7 ++-----
 Editor/SettingsUtil.cs                      | 5 -----
 4 files changed, 2 insertions(+), 20 deletions(-)

diff --git a/Editor/Commands/StripAOTDllCommand.cs b/Editor/Commands/StripAOTDllCommand.cs
index 4028e8c..fed8c6d 100644
--- a/Editor/Commands/StripAOTDllCommand.cs
+++ b/Editor/Commands/StripAOTDllCommand.cs
@@ -12,13 +12,6 @@ namespace HybridCLR.Editor.Commands
 {
     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)]
         public static void GenerateStripedAOTDlls()
         {
diff --git a/Editor/Settings/HybridCLRSettingProvider.cs b/Editor/Settings/HybridCLRSettingProvider.cs
index 471bfdf..c869f80 100644
--- a/Editor/Settings/HybridCLRSettingProvider.cs
+++ b/Editor/Settings/HybridCLRSettingProvider.cs
@@ -19,7 +19,6 @@ namespace HybridCLR.Editor
         private SerializedProperty _hotUpdateDllCompileOutputRootDir;
         private SerializedProperty _externalHotUpdateAssembliyDirs;
         private SerializedProperty _strippedAOTDllOutputRootDir;
-        private SerializedProperty _strippedAOTDllSnapshotDir;
         private SerializedProperty _patchAOTAssemblies;
         private SerializedProperty _outputLinkFile;
         private SerializedProperty _outputAOTGenericReferenceFile;
@@ -47,7 +46,6 @@ namespace HybridCLR.Editor
             _hotUpdateDllCompileOutputRootDir = _serializedObject.FindProperty("hotUpdateDllCompileOutputRootDir");
             _externalHotUpdateAssembliyDirs = _serializedObject.FindProperty("externalHotUpdateAssembliyDirs");
             _strippedAOTDllOutputRootDir = _serializedObject.FindProperty("strippedAOTDllOutputRootDir");
-            _strippedAOTDllSnapshotDir = _serializedObject.FindProperty("strippedAOTDllSnapshotDir");
             _patchAOTAssemblies = _serializedObject.FindProperty("patchAOTAssemblies");
             _outputLinkFile = _serializedObject.FindProperty("outputLinkFile");
             _outputAOTGenericReferenceFile = _serializedObject.FindProperty("outputAOTGenericReferenceFile");
@@ -136,7 +134,6 @@ namespace HybridCLR.Editor
                 EditorGUILayout.PropertyField(_hotUpdateDllCompileOutputRootDir);
                 EditorGUILayout.PropertyField(_externalHotUpdateAssembliyDirs);
                 EditorGUILayout.PropertyField(_strippedAOTDllOutputRootDir);
-                EditorGUILayout.PropertyField(_strippedAOTDllSnapshotDir);
                 EditorGUILayout.PropertyField(_patchAOTAssemblies);
                 EditorGUILayout.PropertyField(_outputLinkFile);
                 EditorGUILayout.PropertyField(_outputAOTGenericReferenceFile);
diff --git a/Editor/Settings/HybridCLRSettings.cs b/Editor/Settings/HybridCLRSettings.cs
index 9b861e1..0ec2fe0 100644
--- a/Editor/Settings/HybridCLRSettings.cs
+++ b/Editor/Settings/HybridCLRSettings.cs
@@ -32,11 +32,8 @@ namespace HybridCLR.Editor
         [Header("外部热更新dll搜索路径")]
         public string[] externalHotUpdateAssembliyDirs;
 
-        [Header("裁减后AOT dll的输出目录")]
-        public string strippedAOTDllOutputRootDir = "HybridCLRData/AOTDllOutput";
-
-        [Header("裁减后AOT dll的备份目录")]
-        public string strippedAOTDllSnapshotDir = "HybridCLRData/AOTDllSnapshot";
+        [Header("裁减后AOT dll输出根目录")]
+        public string strippedAOTDllOutputRootDir = "HybridCLRData/AssembliesPostIl2CppStrip";
 
         [Header("补充元数据AOT dlls")]
         public string[] patchAOTAssemblies;
diff --git a/Editor/SettingsUtil.cs b/Editor/SettingsUtil.cs
index 01c13b3..912b01e 100644
--- a/Editor/SettingsUtil.cs
+++ b/Editor/SettingsUtil.cs
@@ -55,11 +55,6 @@ namespace HybridCLR.Editor
             return $"{AssembliesPostIl2CppStripDir}/{target}";
         }
 
-        public static string GetAOTAssemblySnapshotDir(BuildTarget target)
-        {
-            return $"{HybridCLRSettings.Instance.strippedAOTDllSnapshotDir}/{target}";
-        }
-
         class AssemblyDefinitionData
         {
             public string name;