Commit Graph

126 Commits

Author SHA1 Message Date
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
jonathan adamczewski
64c210d294 AutomationTool, BuildUtilities:
UnrealBuild -> Unreal for EngineDirectory, RootDirectory, IsEngineInstalled, UnrealBuildToolPath
Remove CommandUtils EngineDirectory, RootDirectory, IsEngineInstalled - use equvalents from UnrealBuildBase.Unreal

#jira none

#ROBOMERGE-SOURCE: CL 16648181 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v833-16641396)

[CL 16648203 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-11 18:21:35 -04:00
chris babcock
50e9b2fdc5 Update to AndroidX
#jira UE-117916
#android
#rb Steve.Smith


#ROBOMERGE-SOURCE: CL 16635021 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v831-16623017)

[CL 16635027 by chris babcock in ue5-release-engine-test branch]
2021-06-10 21:45:12 -04:00
jonathan adamczewski
d58996b916 UnrealBuildTool: move some path constants into BuildUtilities
RootDirectory, EngineDirectory, UnrealBuildToolPath are now found in BuildUtilities' UnrealBuild namesapce.

The way these are computed has changed. Previously, it was assumed that the application is UnrealBuildTool, and paths were constructed relative to that assembly.

Now, the assumption is that the process is located under a "Engine/Build/DotNET" sub-path and paths are constructed relative to that.

#jira none

#ROBOMERGE-SOURCE: CL 16607440 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16607455 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-09 12:55:13 -04:00
jonathan adamczewski
3d5833e02f Add a common C# method for detecting the current host platform to EpicGames.Core, and move many a test to use that code.
#jira none
#rb joe.kirchoff

#ROBOMERGE-SOURCE: CL 16593582 in //UE5/Main/...
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Test) (v828-16531559)

[CL 16593589 by jonathan adamczewski in ue5-release-engine-test branch]
2021-06-08 17:01:47 -04:00
Jack Porter
1cb6c1bcde Allow APK generation for UnrealGame when using AGDE, to debug Blueprint projects
#jira None
#rb Chris.Babcock
#preflight 60b8873dae46a100017dfbd2

[CL 16544838 by Jack Porter in ue5-main branch]
2021-06-03 05:52:25 -04:00
aurel cordonnier
8eebe8841f Merge UE5/RET @ 16305968 to UE5/Main
This represents UE4/Main @ 16261013 and Dev-PerfTest @ 16259937

[CL 16306996 by aurel cordonnier in ue5-main branch]
2021-05-12 18:10:03 -04:00
UnrealBot
8afb476248 Branch snapshot for CL 16260158
[CL 16260158 in ue5-release-engine-staging branch]
2021-10-05 20:06:24 +00:00
jonathan adamczewski
1f82bedc58 Removal some references to Mono
#trivial
#jira none

[CL 16171278 by jonathan adamczewski in ue5-main branch]
2021-04-30 14:34:17 -04:00
aurel cordonnier
50944fd712 Merge UE5/RES @ 16162155 to UE5/Main
This represents UE4/Main @ 16130047 and Dev-PerfTest @ 16126156

[CL 16163576 by aurel cordonnier in ue5-main branch]
2021-04-29 19:32:06 -04:00
jeff newquist
5ea7789d60 Rename UE4CommandLine.txt to UECommandLine.txt and deal with all the related changes
#rb TBD
#jira UE-113713

[CL 16093056 by jeff newquist in ue5-main branch]
2021-04-22 10:29:26 -04:00
Marc Audy
01b7c9f4f5 Merge UE5/RES @ 15958325 to UE5/Main
This represents UE4/Main @ 15913390 and Dev-PerfTest @ 15913304

[CL 15958515 by Marc Audy in ue5-main branch]
2021-04-08 14:32:07 -04:00
Yuriy ODonnell
cd3a7c2c77 Fix for copying Vulkan validation layers
#jira UE-110904
#ue4
#android
[at]Jack.Porter
#rb Jack.Porter

#lockdown Jack.Porter

#ROBOMERGE-SOURCE: CL 15724017 in //UE4/Release-4.26/... via CL 15724170 via CL 15724194 via CL 15724212
#ROBOMERGE-BOT: STARSHIP (Main -> Release-Engine-Staging) (v781-15675533)

#ushell-cherrypick of 15744261 by chris.babcock

[CL 15746401 by Yuriy ODonnell in ue5-main branch]
2021-03-19 08:12:49 -04:00
Marc Audy
0cbbc781ca Merge UE5/Release-Engine-Staging @ 15740152 to UE5/Main
This represents UE4/Main @ 15709114

[CL 15740605 by Marc Audy in ue5-main branch]
2021-03-18 15:20:03 -04:00
will damon
14ba1cc2df Fix build.
#rb trivial
[FYI] chris.babcock
#jira none
#rnx

#ROBOMERGE-SOURCE: CL 15700513 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15700536 by will damon in ue5-main branch]
2021-03-15 17:07:30 -04:00
chris babcock
30e37609c3 Remove unnecessary Gradle steps if some files did not change
#jira UE-110644
#ue5
#android
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 15699788 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v781-15675533)

[CL 15699798 by chris babcock in ue5-main branch]
2021-03-15 15:53:45 -04:00
Marc Audy
8f73cd7fa9 Merge UE5/Release-Engine-Staging @ 15630841 to UE5/Main
This represents UE4/Main @ 15601601

[CL 15631170 by Marc Audy in ue5-main branch]
2021-03-05 19:27:14 -04:00