diff --git a/Editor/Build/Platform/BuildAndroid.cs b/Editor/Build/Platform/BuildAndroid.cs index ca3d3b1..5b45c66 100644 --- a/Editor/Build/Platform/BuildAndroid.cs +++ b/Editor/Build/Platform/BuildAndroid.cs @@ -51,14 +51,8 @@ public override void Init() .ToArray(), 0), new BuildVariant(_textureCompressionVariantId, EnumNamesToArray(), 0), -#if UNITY_2019_1_OR_NEWER new BuildVariant(_buildSystemVariantId, new string[] { "Gradle" }, 0), -#else - new BuildVariant(_buildSystemVariantId, new string[] { "Internal", "Gradle" }, 0), -#endif -#if UNITY_2018_2_OR_NEWER new BuildVariant(_splitApksVariantId, new string[] { "Disabled", "Enabled" }, 0), -#endif new BuildVariant(_minSdkVersionVariantId, EnumNamesToArray() .Select(i => i.Replace(_androidApiLevelEnumPrefix, "")) .ToArray(), @@ -84,11 +78,9 @@ public override void ApplyVariant() case _buildSystemVariantId: SetBuildSystem(key); break; -#if UNITY_2018_2_OR_NEWER case _splitApksVariantId: SetSplitApks(key); break; -#endif case _minSdkVersionVariantId: SetMinSdkVersion(key); break; @@ -113,12 +105,10 @@ private void SetBuildSystem(string key) = EnumValueFromKey(key); } -#if UNITY_2018_2_OR_NEWER private void SetSplitApks(string key) { PlayerSettings.Android.buildApkPerCpuArchitecture = key == "Enabled"; } -#endif private void SetMinSdkVersion(string key) { diff --git a/Editor/Build/Platform/BuildLinux.cs b/Editor/Build/Platform/BuildLinux.cs index fd44ec7..5a35d44 100644 --- a/Editor/Build/Platform/BuildLinux.cs +++ b/Editor/Build/Platform/BuildLinux.cs @@ -28,20 +28,12 @@ public override void Init() if (architectures == null || architectures.Length == 0) { architectures = new BuildArchitecture[] { - new BuildArchitecture(BuildTarget.StandaloneLinux64, "Linux x64", false, "{0}.x86_64"), + new BuildArchitecture(BuildTarget.StandaloneLinux64, "Linux x64", true, "{0}.x86_64"), #if !UNITY_2019_2_OR_NEWER - new BuildArchitecture(BuildTarget.StandaloneLinuxUniversal, "Linux Universal", true, "{0}"), + new BuildArchitecture(BuildTarget.StandaloneLinuxUniversal, "Linux Universal", false, "{0}"), new BuildArchitecture(BuildTarget.StandaloneLinux, "Linux x86", false, "{0}.x86"), #endif }; - -#if UNITY_2018_3_OR_NEWER - architectures[0].enabled = true; -#endif - -#if UNITY_2018_3_OR_NEWER && !UNITY_2019_2_OR_NEWER - architectures[1].enabled = false; -#endif } } }