Skip to content

Commit

Permalink
Remove pre-Unity 2019.1 code
Browse files Browse the repository at this point in the history
  • Loading branch information
robinnorth committed May 13, 2021
1 parent 5c1e4a9 commit eeb0f80
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 20 deletions.
10 changes: 0 additions & 10 deletions Editor/Build/Platform/BuildAndroid.cs
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,8 @@ public override void Init()
.ToArray(),
0),
new BuildVariant(_textureCompressionVariantId, EnumNamesToArray<MobileTextureSubtarget>(), 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<AndroidSdkVersions>()
.Select(i => i.Replace(_androidApiLevelEnumPrefix, ""))
.ToArray(),
Expand All @@ -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;
Expand All @@ -113,12 +105,10 @@ private void SetBuildSystem(string key)
= EnumValueFromKey<AndroidBuildSystem>(key);
}

#if UNITY_2018_2_OR_NEWER
private void SetSplitApks(string key)
{
PlayerSettings.Android.buildApkPerCpuArchitecture = key == "Enabled";
}
#endif

private void SetMinSdkVersion(string key)
{
Expand Down
12 changes: 2 additions & 10 deletions Editor/Build/Platform/BuildLinux.cs
Original file line number Diff line number Diff line change
Expand Up @@ -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
}
}
}
Expand Down

0 comments on commit eeb0f80

Please sign in to comment.