Commit Graph

98 Commits

Author SHA1 Message Date
Marc Audy
cac1fe0019 Merge UE5/Release-Engine-Staging @ CL# 15299266 to UE5/Main
This represents UE4/Main @ CL# 15277572

[CL 15299962 by Marc Audy in ue5-main branch]
2021-02-03 14:57:28 -04:00
Chris Babcock
a2d9bd542e Change Android class names from ue4 to unreal
#jira UE-104943
#ue5
#android
#review @Jack.Porter
#rb Jack.Porter

[CL 15284943 by Chris Babcock in ue5-main branch]
2021-02-02 17:21:35 -04:00
Marc Audy
bc88b73a29 Merge Release-Engine-Staging to Main @ CL# 15151250
Represents UE4/Main @ 15133763

[CL 15158774 by Marc Audy in ue5-main branch]
2021-01-21 16:22:06 -04:00
Josh Adams
b84453bc37 - Remove support for 32-bit Android, still have support for Arm64 and X64. Next checkin will delete the libs
#rb chris.babcock,jack.porter
#fyi chris.babcock,jack.porter

[CL 15056295 by Josh Adams in ue5-main branch]
2021-01-12 16:59:21 -04:00
Marc Audy
bf80889353 UE5/Release-Engine-Staging to UE5/Main
This represents UE4/Main up to CL# 14958402

[CL 15028197 by Marc Audy in ue5-main branch]
2021-01-08 19:56:07 -04:00
Ben Marsh
6f927647b1 Changing C# code over to using EpicGames.Core over DotNETCommon.
#rb none
#rnx

[CL 14962096 by Ben Marsh in ue5-main branch]
2020-12-21 23:07:37 -04:00
Ben Marsh
83f27d27e9 UBT: Mark platforms and project file generation code as not nullable aware.
#rb none
#rnx

[CL 14960496 by Ben Marsh in ue5-main branch]
2020-12-20 17:32:59 -04:00
Marc Audy
50a3d7d368 Merge Release-Engine-Staging to Main @ CL# 14467590
This represents UE4/Main @ 14432125 + some cherrypick fixes

[CL 14468207 by Marc Audy in ue5-main branch]
2020-10-09 22:42:26 -04:00
Marcus Wassmer
3b81cf8201 Merging using //UE5/Main_to_//UE5/Release-Engine-Staging @14384769
autoresolved files
#rb none

[CL 14384911 by Marcus Wassmer in ue5-main branch]
2020-09-24 00:43:27 -04:00
Josh Adams
ab4a48f566 - Moved UEBuildPlatformSDK into a separate DLL, BuildUtilities (similar to DotNETUtilities), allowing for better sharing of code between UBT and UAT (Turnkey in particular)
- Refactored SDK versioning into more formalized APIs for all platforms. Currently UBT will not error with bad versions, but that is coming.
- Turnkey updated to use new BuildUtilities
#rb ben.marsh

[CL 13733158 by Josh Adams in ue5-main branch]
2020-06-22 14:32:25 -04:00
chris babcock
c8135249c6 Add Opus libraries for Android x86
#jira UE-85785
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 13051799 in //UE4/Release-4.25/... via CL 13051805 via CL 13051811
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v686-13045012)

[CL 13051816 by chris babcock in Main branch]
2020-04-27 17:59:56 -04:00
Florin Pascu
3f0e82dca7 Error if x64 or x86 is only platform and in binarybuild
#jira UE-92455
#rb Chris.Babcock
#fyi Jack.Porter

#ushell-cherrypick of 13034826 by Florin.Pascu

[CL 13035774 by Florin Pascu in Main branch]
2020-04-24 14:18:45 -04:00
chris babcock
87f2079cd0 Remove redundant compiler flags on x86_64 architectures
#ue4
#android
#rb trivial


#ROBOMERGE-SOURCE: CL 13034541 via CL 13034548 via CL 13034550
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13034553 by chris babcock in Main branch]
2020-04-24 12:38:46 -04:00
chris babcock
9696573221 Give a warning if a non-source version of engine tries to compile for x64 on Android
#jira UE-92429
#ue4
#android
[FYI] Jack.Porter
#rb Florin.Pascu

#ROBOMERGE-SOURCE: CL 13024957 in //UE4/Release-4.25/... via CL 13024986 via CL 13025060
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13025129 by chris babcock in Main branch]
2020-04-23 19:37:07 -04:00
chris babcock
f1931debe2 Update SetupAndroid scripts to install Android NDK 21b with fixed clang for x86_64
#jira UE-89957
#ue4
[FYI] Jack.Porter
#android
#rb Trevor.Stone

#ROBOMERGE-SOURCE: CL 12941104 in //UE4/Release-4.25/... via CL 12941110 via CL 12941115
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12941120 by chris babcock in Main branch]
2020-04-20 19:56:37 -04:00
chris babcock
5f70ec1e68 Fix typo
#jira none
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 12900348 in //UE4/Release-4.25/... via CL 12900366 via CL 12900380
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907100 by chris babcock in Main branch]
2020-04-18 15:55:56 -04:00
chris babcock
b42f704352 Allow -armv7 etc on -architectures for Android in UBT
#jira UE-92110
#ue4
#android
#rb Florin.Pascu

#ROBOMERGE-SOURCE: CL 12900306 in //UE4/Release-4.25/... via CL 12900310 via CL 12900312
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907099 by chris babcock in Main branch]
2020-04-18 15:55:54 -04:00
chris babcock
a90f080e9c Disable --gc-sections on link if not compiling with -ffunction-sections and -fdata-sections for Android
#android
[FYI] Jack.Porter
#rb trivial


#ROBOMERGE-SOURCE: CL 12759487 via CL 12759490 via CL 12759492
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12759498 by chris babcock in Main branch]
2020-04-13 14:02:53 -04:00
Ben Marsh
d6d7c939e5 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 12726184 by Ben Marsh in Main branch]
2020-04-10 11:30:32 -04:00
chris babcock
25f0cf8528 Fix -shared flag so sent to clang instead of passed only to linker
#jira UE-91820
#ue4
#android
#rb Trevor.Stone

#ROBOMERGE-SOURCE: CL 12714250 in //UE4/Release-4.25/... via CL 12714252 via CL 12714257
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12714261 by chris babcock in Main branch]
2020-04-09 21:18:13 -04:00
chris babcock
b29a250c87 Fix issues with stdlib and x86_64 linking
#jira UE-89957,UE-90022
#ue4
#android
[FYI] Jack.Porter
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 12504708 in //UE4/Release-4.25/... via CL 12504709 via CL 12504729
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12504762 by chris babcock in Main branch]
2020-04-01 05:00:44 -04:00
josh adams
242106c274 - Another android link attempt, this one linked in all 3 configs on EC
#rb chris.babcock
[FYI] chris.babcock
#rnx


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 12249951 via CL 12249994
#ROBOMERGE-BOT: (v668-12245121)

[CL 12250003 by josh adams in Main branch]
2020-03-18 14:57:45 -04:00
chris babcock
dd83c15367 Fix arm64 non-debug flags for -fdata-sections
#jira FORT-270813
#ue4
#android
[FYI] Josh.Adams
#rb Josh.Adams


#ROBOMERGE-OWNER: chris.babcock
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 12239693 in //UE4/Release-4.25/... via CL 12239694
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12239732 by chris babcock in Main branch]
2020-03-18 00:01:00 -04:00
michael sartain
43ef13a97b Fix UnrealBuildTool unused variable warnings
#jira none
#rb Ben.Marsh
[FYI] Andrew.Grant, Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12224860 in //UE4/Release-4.25/... via CL 12224862
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v663-12210973)

[CL 12224868 by michael sartain in Main branch]
2020-03-16 19:04:42 -04:00
ben marsh
09ca12ccef Refactor UBT to use an interface (IActionGraphBuilder) to construct the action graph. Response files are also constructed through this interface, allowing them to be tracked as dependencies (will be added in subsequent change).
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12038895 in //UE4/Release-4.25/... via CL 12038911
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076066 by ben marsh in Main branch]
2020-03-09 13:20:14 -04:00