Commit Graph

142 Commits

Author SHA1 Message Date
Ben Marsh
cbb950c578 UBT: Use ILogger throughout UBT, rather than legacy EpicGames.Core.Log methods. All output going forwards should use structured logging rather than String.Format style logging.
#preflight 628e9dc6e746de4961f60032

[CL 20373777 by Ben Marsh in ue5-main branch]
2022-05-25 19:55:37 -04:00
Joe Kirchoff
6c92065094 UnrealBuildTool: Merge various Clang ToolChainOptions enums
#rb none
#rnx
#preflight 62843567925bbe69df8dc8d4

[CL 20358298 by Joe Kirchoff in ue5-main branch]
2022-05-24 19:41:41 -04:00
dmytro vovk
1fc026af4b Fixed Android builds with NDK25
#jira none
#rb Chris.Babcock
#preflight 628ce503c97e4beea3a161a7

[CL 20347836 by dmytro vovk in ue5-main branch]
2022-05-24 10:15:43 -04:00
dmytro vovk
b35c633905 Update minSDKVersion to be higher or equal than NDK API version to prevent runtime DSO loading errors on Android
#rb Chris.Babcock
#jira UE-152621
#preflight 62857948571eb4bfb614e9fb

[CL 20270715 by dmytro vovk in ue5-main branch]
2022-05-18 19:08:42 -04:00
dmytro vovk
f3e6bce755 Update Android dependencies to use static libc++ instead of libc++_shared
#jira UE-131966
#rb Chris.Babcock

#ROBOMERGE-AUTHOR: dmytro.vovk
#ROBOMERGE-SOURCE: CL 20121044 via CL 20121102 via CL 20121151
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v943-19904690)

[CL 20122386 by dmytro vovk in ue5-main branch]
2022-05-10 09:48:16 -04:00
jonathan adamczewski
c1bb6901bf Upgrade to .NET 6.0
#jira UE-119846
#preflight 624cbb2ecc0872e96b0d5181

[CL 19652696 by jonathan adamczewski in ue5-main branch]
2022-04-06 14:46:50 -04:00
PJ Kack
91d645a0a8 Android editor integration improvements.
UAT RunClient: Continuously redirect output to uat stdout while client is running.
UAT RunClient: Add a process wrapper to kill client process when uat exits and to write the adb device log file to the host pc directories.
UAT RunClient: Push the ClientCmdLine args as a UECommandLine.txt file to the device to the correct location (different for adb deploy and android file server) to override the stage/apk command line.
UAT MakeApk: Add a UECommandLine.txt cache file to the intermediate directory to invalidate the apk when the stage/apk command line changes (e.g. when switching between CBTB or COTF or cooking with/without Zen).
LaunchAndroid.cpp: Add debug output for which override command line file that is being used.
LaunchAndroid.cpp: Implement missing -waitforattach/-waitfordebugger feature.
DataDrivenPlatformInfo.ini: set bUATClosesAfterLaunch=false to stop the editor from passing -nokill to uat to let it stop all processes when the client exits..

#jira none
#rb chris.babcock
#rnx
#preflight 6245849873665f7d5e4f0a18
#preflight 624be1f3dc6183e3f5518801

[CL 19621549 by PJ Kack in ue5-main branch]
2022-04-05 02:48:11 -04:00
jonathan adamczewski
5c68d1d9ef Revert //UE5/Main/... changelist 19531725 - return to NET Core 3.1
#preflight 62422fd0470aff98e946bfce
#jira UE-119846

[CL 19534572 by jonathan adamczewski in ue5-main branch]
2022-03-28 18:25:19 -04:00
jonathan adamczewski
18ac15cbb1 Upgrade to .NET 6.0
#jira UE-119846
#preflight 6241fc06470aff98e943c035

[CL 19531725 by jonathan adamczewski in ue5-main branch]
2022-03-28 15:30:56 -04:00
dmytro vovk
57d3d250c4 Remove bForceCompressNativeLibs Android setting as it's a dublicate of bExtractNativeLibs
#jira none
#rb Chris.Babcock

#ushell-cherrypick of 19456583 by dmytro.vovk
#preflight 6238d24789625f0612a47330

[CL 19457054 by dmytro vovk in ue5-main branch]
2022-03-21 15:54:03 -04:00
chris babcock
3214d9485f Protect against additional configChanges which could terminate an Android application
#jira UE-116891
#android
[REVIEW] [at]Robert.Srinivasiah
#rb Robert.Srinivasiah

#preflight https://horde.devtools.epicgames.com/job/622be75f46679d56c32d8b47
#lockdown Nick.Whiting

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19366087 in //UE5/Release-5.0/... via CL 19366607
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19367967 by chris babcock in ue5-main branch]
2022-03-12 13:41:25 -04:00
chris babcock
be3d52e313 Added UPL registerBuildSettings node to list plugin ini settings that affect packaging
Added registerBuildSettings node to AndroidFileServer UPL

#jira UE-145479
#android
[REVIEW] [at]Robert.Srinivasiah
#rb Robert.Srinivasiah

#preflight https://horde.devtools.epicgames.com/job/622bb4b9902b7ca699dfe337
#lockdown Mitchell.Wilson

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 19360716 in //UE5/Release-5.0/... via CL 19361833
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v926-19321884)

[CL 19364204 by chris babcock in ue5-main branch]
2022-03-11 19:02:48 -05:00
Florin Pascu
d29533ae3a PropagateAlpha fix for Android
#jira none
#preflight 622b03ee0a614dcb0ce75c6b
#rb Chris.Babcock

[CL 19351631 by Florin Pascu in ue5-main branch]
2022-03-11 03:41:10 -05:00
allan bentham
bc9a67a871 Android OGL will create multiple separate services for precompiling GLES programs.
only used during PSO precompiling.
This can reduce PSO precompile times by as much as 2/3rds.
It is enabled by default, it can be disabled via Android.OpenGL.NumRemoteProgramCompileServices=0 or setting android configrule variable 'DisableProgramCompileServices' to true.

#rb chris.babcock, Dmitriy.Dyomin
[FYI] peter.sauerbrei, jack.porter


#preflight 6218decf847077002e87365b

#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 19147130 via CL 19147174 via CL 19148641 via CL 19148655 via CL 19160382
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v921-19075845)

[CL 19161662 by allan bentham in ue5-main branch]
2022-02-25 19:54:29 -05:00
chris babcock
85e722a84d Fix installed SDK components and min and max buils-tools used for Android
#jira UE-139924
#android
[REVIEW] [at]Allan.Bentham
#rb Allan.Bentham
#preflight local

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 18901617 in //UE5/Release-5.0/... via CL 18901767 via CL 18901860
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v912-18901109)

[CL 18901888 by chris babcock in ue5-main branch]
2022-02-08 09:46:18 -05:00
kasp1
67bb6d1a48 PR #8836: Fix for uploading Android 12 shipping builds (Contributed by kasp1)
#android
#preflight
#rb Chris.Babcock

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 18796608 in //UE5/Release-5.0/... via CL 18797770 via CL 18798490
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v908-18788545)

[CL 18798611 by kasp1 in ue5-main branch]
2022-01-31 17:03:31 -05:00
allan bentham
89d4a4b090 Provide a way for Android java to set UE's crash context.
#rb jack.porter
#preflight 619b8e5b0141b3c6da20edeb

#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 18256890 via CL 18256928 via CL 18256942 via CL 18263305 via CL 18263406
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v895-18170469)

[CL 18263527 by allan bentham in ue5-release-engine-test branch]
2021-11-22 16:44:57 -05:00
Marc Audy
0c3be2b6ad Merge Release-Engine-Staging to Test @ CL# 18240298
[CL 18241953 by Marc Audy in ue5-release-engine-test branch]
2021-11-18 14:37:34 -05:00
carl lloyd
d4e12bf0d0 Stripped PLATFORM_ANDROID_VULKAN and PLATFORM_ANDROIDGL4
Removed old GPU Architecture code from android tool chain

#rb Chris.Babcock
[FYI] Jack.Porter
#jira UE-131194

#ROBOMERGE-AUTHOR: carl.lloyd
#ROBOMERGE-SOURCE: CL 18087187 in //UE5/Release-5.0/... via CL 18088638
#ROBOMERGE-BOT: STARSHIP (Release-Engine-Staging -> Release-Engine-Test) (v889-18060218)
#ROBOMERGE[STARSHIP]: UE5-Main

[CL 18088741 by carl lloyd in ue5-release-engine-test branch]
2021-11-08 12:22:54 -05:00
aurel cordonnier
a6e741e007 Merge from Release-Engine-Staging @ 17915896 to Release-Engine-Test
This represents UE4/Main @17911760, Release-5.0 @17915875 and Dev-PerfTest @17914035

[CL 17918595 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-25 20:05:28 -04:00
aurel cordonnier
a12d56ff31 Merge from Release-Engine-Staging @ 17791557 to Release-Engine-Test
This represents UE4/Main @17774255, Release-5.0 @17791557 and Dev-PerfTest @17789485

[CL 17794212 by aurel cordonnier in ue5-release-engine-test branch]
2021-10-12 21:21:22 -04:00
aurel cordonnier
69fe095547 Merge from Release-Engine-Staging @ 17636544 to Release-Engine-Test
This represents UE4/Main @17638339 and Dev-PerfTest @17636504

[CL 17638842 by aurel cordonnier in ue5-release-engine-test branch]
2021-09-27 19:54:25 -04:00
chris babcock
d0dd9d1136 Fix issue with resizableActivity in manifest
#jira UE-106793
#ue5
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 17107327 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v854-17104634)

[CL 17107359 by chris babcock in ue5-release-engine-test branch]
2021-08-09 16:42:47 -04:00
aurel cordonnier
dc4bf61540 Merge from Release-Engine-Staging @ 17030559 to Release-Engine-Test
This represents UE4/Main @ 17030256 and Dev-PerfTest @ 17030553

[CL 17031509 by aurel cordonnier in ue5-release-engine-test branch]
2021-08-03 11:56:47 -04:00
aurel cordonnier
02c0f425e8 Copy up from Release-Engine-Staging @ 16738359
This represents UE4/Main @ 16738161 and Dev-PerfTest @ 16737719

[CL 16738582 by aurel cordonnier in ue5-release-engine-test branch]
2021-06-22 00:27:54 -04:00