Revert "Android GPU support with vulkan"

This reverts commit 43622aa.

Author: amakropoulos

Editor/LLMEditor.cs

@@ -436,23 +436,10 @@ private void CopyToClipboard(string text)
 
         public override void AddSetupExtras(SerializedObject llmScriptSO)
         {
-            if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows || 
-                EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneWindows64 || 
-                EditorUserBuildSettings.activeBuildTarget == BuildTarget.StandaloneLinux64)
-            {
-                bool useCUBLAS = LLMUnitySetup.CUBLAS;
-                GUIContent contentCUBLAS = new GUIContent("Light build for Nvidia GPUs", "Use tinyBLAS instead of cuBLAS that takes up less space and has similar performance for quants - doesn't work with i-quants and flash attention");
-                bool newUseCUBLAS = !EditorGUILayout.Toggle(contentCUBLAS, !useCUBLAS);
-                if (newUseCUBLAS != useCUBLAS) LLMUnitySetup.SetCUBLAS(newUseCUBLAS);
-            }
-
-            if (EditorUserBuildSettings.activeBuildTarget == BuildTarget.Android)
-            {
-                bool useAndroidVulkan = LLMUnitySetup.AndroidVulkan;
-                GUIContent contentAndroidVulkan = new GUIContent("Use Android GPU (Vulkan, API>=29)", "Use the Android Vulkan build that works with the Android GPU according to the number of GPU layers");
-                bool newUseAndroidVulkan = EditorGUILayout.Toggle(contentAndroidVulkan, useAndroidVulkan);
-                if (newUseAndroidVulkan != useAndroidVulkan) LLMUnitySetup.SetAndroidVulkan(newUseAndroidVulkan);
-            }
+            bool useCUBLAS = LLMUnitySetup.CUBLAS;
+            GUIContent content = new GUIContent("Light build for Nvidia GPUs", "Use tinyBLAS instead of cuBLAS that takes up less space and has similar performance for quants - doesn't work with i-quants and flash attention");
+            bool newUseCUBLAS = !EditorGUILayout.Toggle(content, !useCUBLAS);
+            if (newUseCUBLAS != useCUBLAS) LLMUnitySetup.SetCUBLAS(newUseCUBLAS);
         }
 
         public override void OnInspectorGUI()

Runtime/LLMBuilder.cs

@@ -212,10 +212,7 @@ public static void BuildLibraryPlatforms(BuildTarget buildTarget)
                     platforms.Add("osx-arm64");
                     break;
                 case BuildTarget.Android:
-                    if (LLMUnitySetup.AndroidVulkan)
-                        platforms.Add("android-arm64-vulkan");
-                    else
-                        platforms.Add("android-arm64");
+                    platforms.Add("android-arm64");
                     platforms.Add("android-x64");
                     break;
                 case BuildTarget.iOS:
@@ -270,7 +267,7 @@ public static void BuildLibraryPlatforms(BuildTarget buildTarget)
             {
                 foreach (string platform in platforms)
                 {
-                    string source = Path.Combine(LLMUnitySetup.libraryPath, platform, "native", $"libllamalib_{platform}.{MobileSuffix(buildTarget)}");
+                    string source = Path.Combine(LLMUnitySetup.libraryPath, platform, "native",  $"libllamalib_{platform}.{MobileSuffix(buildTarget)}");
                     string target = MobilePluginPath(buildTarget, platform.Split("-")[1].ToUpper());
                     string pluginDir = PluginDir(buildTarget.ToString());
                     MoveAction(source, target);

Runtime/LLMUnitySetup.cs

@@ -170,8 +170,6 @@ public class LLMUnitySetup
         static string DebugModeKey = "DebugMode";
         public static bool CUBLAS = false;
         static string CUBLASKey = "CUBLAS";
-        public static bool AndroidVulkan = false;
-        static string AndroidVulkanKey = "AndroidVulkan";
         static List<Action<string>> errorCallbacks = new List<Action<string>>();
         static readonly object lockObject = new object();
         static Dictionary<string, Task> androidExtractTasks = new Dictionary<string, Task>();
@@ -211,7 +209,6 @@ static void LoadPlayerPrefs()
         {
             DebugMode = (DebugModeType)PlayerPrefs.GetInt(DebugModeKey, (int)DebugModeType.All);
             CUBLAS = PlayerPrefs.GetInt(CUBLASKey, 0) == 1;
-            AndroidVulkan = PlayerPrefs.GetInt(AndroidVulkanKey, 0) == 1;
         }
 
         public static void SetDebugMode(DebugModeType newDebugMode)
@@ -231,14 +228,6 @@ public static void SetCUBLAS(bool value)
             PlayerPrefs.Save();
         }
 
-        public static void SetAndroidVulkan(bool value)
-        {
-            if (AndroidVulkan == value) return;
-            AndroidVulkan = value;
-            PlayerPrefs.SetInt(AndroidVulkanKey, value ? 1 : 0);
-            PlayerPrefs.Save();
-        }
-
 #endif
 
         public static string GetAssetPath(string relPath = "")