From db463b031d42484bf7ff2b057a8bf0c94dea4a9c Mon Sep 17 00:00:00 2001 From: josh adams Date: Wed, 10 Feb 2021 02:48:20 -0400 Subject: [PATCH] - Fixed Android AutoSDK version from not showing up as valid in Turnkey #rb trivial [FYI] patrick.kelly #ROBOMERGE-SOURCE: CL 15374628 in //UE5/Release-5.0-EarlyAccess/... #ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668) [CL 15374631 by josh adams in ue5-main branch] --- .../BuildUtilities/UEBuildPlatformSDK.cs | 16 +++++++--------- 1 file changed, 7 insertions(+), 9 deletions(-) diff --git a/Engine/Source/Programs/DotNETCommon/BuildUtilities/UEBuildPlatformSDK.cs b/Engine/Source/Programs/DotNETCommon/BuildUtilities/UEBuildPlatformSDK.cs index 4db0d817eb4d..3376b500abce 100644 --- a/Engine/Source/Programs/DotNETCommon/BuildUtilities/UEBuildPlatformSDK.cs +++ b/Engine/Source/Programs/DotNETCommon/BuildUtilities/UEBuildPlatformSDK.cs @@ -271,6 +271,13 @@ namespace EpicGames.Core return false; } + // AutoSDK must match the desired version exactly, since that is the only one we will use + if (bForAutoSDK) + { + // if integer version checking failed, then we can detect valid autosdk if the version matches the autosdk directory by name + return string.Compare(Version, GetAutoSDKDirectoryForMainVersion(), true) == 0; + } + // convert it to an integer UInt64 IntVersion; if (!TryConvertVersionToInt(Version, out IntVersion)) @@ -289,15 +296,6 @@ namespace EpicGames.Core { return true; } - else - { - // AutoSDK must match the desired version exactly, since that is the only one we will use - if (bForAutoSDK) - { - // if integer version checking failed, then we can detect valid autosdk if the version matches the autosdk directory by name - return string.Compare(Version, GetAutoSDKDirectoryForMainVersion(), true) == 0; - } - } // get numeric range UInt64 MinVersion, MaxVersion;