izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Do not assume LTO when PGO is enabled on Android as it doesn't work well with NDK21

Browse Source 
#jira none
#rb trivial
#preflight 6331a0757b582f58ab63f6a7

[CL 22188490 by dmytro vovk in ue5-main branch]
This commit is contained in:
dmytro vovk
2022-09-26 13:27:42 -04:00
parent 7908ecfd03
commit 400afa0738
2 changed files with 2 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Engine/Source/Programs/UnrealBuildTool/Platform/Android/AndroidToolChain.cs
View File

@@ -721,8 +721,7 @@ namespace UnrealBuildTool
Result += " -gline-tables-only";
}
bool bEnableLTO = CompileEnvironment.bPGOOptimize || CompileEnvironment.bPGOProfile;
if (CompileEnvironment.bAllowLTCG || bEnableLTO)
if (CompileEnvironment.bAllowLTCG)
{
if ((Options & ClangToolChainOptions.EnableThinLTO) != 0)
{
@@ -888,8 +887,7 @@ namespace UnrealBuildTool
Result += " -gline-tables-only";
}
bool bEnableLTO = LinkEnvironment.bPGOOptimize || LinkEnvironment.bPGOProfile;
if (LinkEnvironment.bAllowLTCG || bEnableLTO)
if (LinkEnvironment.bAllowLTCG)
{
if ((Options & ClangToolChainOptions.EnableThinLTO) != 0)
{

8
Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEBuildAndroid.cs
View File

@@ -469,14 +469,6 @@ namespace UnrealBuildTool
}
}
// For consistency with other platforms, also enable LTO whenever doing profile-guided optimizations.
// Obviously both PGI (instrumented) and PGO (optimized) binaries need to have that
if (CompileEnvironment.bPGOProfile || CompileEnvironment.bPGOOptimize)
{
CompileEnvironment.bAllowLTCG = true;
LinkEnvironment.bAllowLTCG = true;
}
CompileEnvironment.Definitions.Add("INT64_T_TYPES_NOT_LONG_LONG=1");
SetUpSpecificEnvironment(Target, CompileEnvironment, LinkEnvironment, Logger);