fix bugs for Apple plugins. Framework and Library cannot be embeded. a…

…pple/unityplugins#20 and apple/unityplugins#6
realitydeslab · Nov 10, 2023 · 2ca8a90 · 2ca8a90
1 parent dd0c791
commit 2ca8a90
Showing 1 changed file with 4 additions and 2 deletions.
diff --git a/Packages/com.apple.unityplugin.core/Editor/AppleFrameworkUtility.cs b/Packages/com.apple.unityplugin.core/Editor/AppleFrameworkUtility.cs
@@ -32,7 +32,9 @@ public static string GetPluginLibraryPathForBuildTarget(string libraryName, Buil
                     return string.Empty;
             }
 
-            string[] results = AssetDatabase.FindAssets(libraryName);
+            string libraryNameWithoutExtension = Path.GetFileNameWithoutExtension(libraryName);
+            string[] results = AssetDatabase.FindAssets(libraryNameWithoutExtension);
+
             foreach (string currGUID in results)
             {
                 string libraryPath = AssetDatabase.GUIDToAssetPath(currGUID);
@@ -136,7 +138,7 @@ public static void CopyAndEmbed(string source, BuildTarget buildTarget, string p
             {
                 var expectedInstallPath = source.Substring(source.LastIndexOf(searchString) + searchString.Length);
                 Debug.Log($"CopyAndEmbed - Expected install path for {frameworkName}: {expectedInstallPath}");
-                fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine("Frameworks", expectedInstallPath));
+                fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine(frameworkName.EndsWith(".a") ? "Libraries" : "Frameworks", expectedInstallPath));
                 if (string.IsNullOrEmpty(fileGuid))
                 {
                     fileGuid = pbxProject.FindFileGuidByProjectPath(Path.Combine("Libraries", expectedInstallPath));