From 1eaaf44c978999668ca665eaa94e5552ba53ee02 Mon Sep 17 00:00:00 2001
From: walon <walon@code-philosophy.com>
Date: Tue, 5 Sep 2023 16:47:28 +0800
Subject: [PATCH] =?UTF-8?q?[fix]=20=E4=BF=AE=E5=A4=8D=E4=B8=8D=E6=AD=A3?=
 =?UTF-8?q?=E7=A1=AE=E5=9C=B0=E4=BB=8EEditorUserBuildSettings.selectedBuil?=
 =?UTF-8?q?dTargetGroup=E8=8E=B7=E5=BE=97BuildGroupTarget=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Editor/BuildProcessors/CheckSettings.cs | 3 ++-
 Editor/Commands/PrebuildCommand.cs      | 2 +-
 Editor/Commands/StripAOTDllCommand.cs   | 8 ++++----
 3 files changed, 7 insertions(+), 6 deletions(-)

diff --git a/Editor/BuildProcessors/CheckSettings.cs b/Editor/BuildProcessors/CheckSettings.cs
index defe491..42896cf 100644
--- a/Editor/BuildProcessors/CheckSettings.cs
+++ b/Editor/BuildProcessors/CheckSettings.cs
@@ -7,6 +7,7 @@ using UnityEditor;
 using UnityEditor.Build;
 using UnityEditor.Build.Reporting;
 using UnityEngine;
+using static UnityEngine.GraphicsBuffer;
 
 namespace HybridCLR.Editor.BuildProcessors
 {
@@ -39,7 +40,7 @@ namespace HybridCLR.Editor.BuildProcessors
             {
                 return;
             }
-            BuildTargetGroup buildTargetGroup = EditorUserBuildSettings.selectedBuildTargetGroup;
+            BuildTargetGroup buildTargetGroup = BuildPipeline.GetBuildTargetGroup(EditorUserBuildSettings.activeBuildTarget);
             ScriptingImplementation curScriptingImplementation = PlayerSettings.GetScriptingBackend(buildTargetGroup);
             ScriptingImplementation targetScriptingImplementation = ScriptingImplementation.IL2CPP;
             if (curScriptingImplementation != targetScriptingImplementation)
diff --git a/Editor/Commands/PrebuildCommand.cs b/Editor/Commands/PrebuildCommand.cs
index 89196c4..8fe2a46 100644
--- a/Editor/Commands/PrebuildCommand.cs
+++ b/Editor/Commands/PrebuildCommand.cs
@@ -23,7 +23,7 @@ namespace HybridCLR.Editor.Commands
             LinkGeneratorCommand.GenerateLinkXml(target);
 
             // 生成裁剪后的aot dll
-            StripAOTDllCommand.GenerateStripedAOTDlls(target, EditorUserBuildSettings.selectedBuildTargetGroup);
+            StripAOTDllCommand.GenerateStripedAOTDlls(target);
 
             // 桥接函数生成依赖于AOT dll，必须保证已经build过，生成AOT dll
             MethodBridgeGeneratorCommand.GenerateMethodBridge(target);
diff --git a/Editor/Commands/StripAOTDllCommand.cs b/Editor/Commands/StripAOTDllCommand.cs
index e5d5e96..4c27b47 100644
--- a/Editor/Commands/StripAOTDllCommand.cs
+++ b/Editor/Commands/StripAOTDllCommand.cs
@@ -15,7 +15,7 @@ namespace HybridCLR.Editor.Commands
         [MenuItem("HybridCLR/Generate/AOTDlls", priority = 105)]
         public static void GenerateStripedAOTDlls()
         {
-            GenerateStripedAOTDlls(EditorUserBuildSettings.activeBuildTarget, EditorUserBuildSettings.selectedBuildTargetGroup);
+            GenerateStripedAOTDlls(EditorUserBuildSettings.activeBuildTarget);
         }
 
         private static string GetLocationPathName(string buildDir, BuildTarget target)
@@ -32,7 +32,7 @@ namespace HybridCLR.Editor.Commands
             }
         }
 
-        public static void GenerateStripedAOTDlls(BuildTarget target, BuildTargetGroup group)
+        public static void GenerateStripedAOTDlls(BuildTarget target)
         {
             string outputPath = $"{SettingsUtil.HybridCLRDataDir}/StrippedAOTDllsTempProj/{target}";
             BashUtil.RemoveDir(outputPath);
@@ -81,7 +81,7 @@ namespace HybridCLR.Editor.Commands
                 locationPathName = GetLocationPathName(outputPath, target),
                 options = buildOptions,
                 target = target,
-                targetGroup = group,
+                targetGroup = BuildPipeline.GetBuildTargetGroup(target),
             };
 
             var report = BuildPipeline.BuildPlayer(buildPlayerOptions);
@@ -115,7 +115,7 @@ namespace HybridCLR.Editor.Commands
             {
                 throw new Exception("GenerateStripedAOTDlls failed");
             }
-            Debug.Log($"GenerateStripedAOTDlls target:{target} group:{group} path:{outputPath}");
+            Debug.Log($"GenerateStripedAOTDlls target:{target} path:{outputPath}");
         }
     }
 }