Commit Graph

33 Commits

Author SHA1 Message Date
chris babcock
51b09873a4 Fix issue with Android env vars not always set on Mac
#jira UE-209092
#android
[REVIEW] [at]Billy.Quick
#rb Billy.Quick

[CL 32099458 by chris babcock in ue5-main branch]
2024-03-07 15:48:23 -05:00
dmytro ivanov
32d57e9b28 Don't bundle libUnreal.so in .apk for faster iteration
#jira UE-186383
#rb Chris.Babcock

[CL 28967167 by dmytro ivanov in ue5-main branch]
2023-10-20 11:24:28 -04:00
joe kirchoff
acacd6a8de UnrealBuildTool: More automated code cleanup
* Use object type rather than var
* Remove double newlines
* Use pattern matching

#rnx
#preflight 647780095d23eca37d28a387

[CL 25706751 by joe kirchoff in ue5-main branch]
2023-05-31 13:37:21 -04:00
joe kirchoff
acf80ab609 [Backout] - CL25694851
[FYI] Joe.Kirchoff
Original CL Desc
-----------------------------------------------------------------
UnrealBuildTool: More automated code cleanup

#rnx

[CL 25695155 by joe kirchoff in ue5-main branch]
2023-05-30 19:55:37 -04:00
joe kirchoff
7ed1a39679 UnrealBuildTool: More automated code cleanup
#rnx

[CL 25694864 by joe kirchoff in ue5-main branch]
2023-05-30 19:36:05 -04:00
joe kirchoff
c04da27b3b UnrealBuildTool: More automated code cleanup
#rnx
#preflight 64767efb4b1ead7c7f428c7a

[CL 25693857 by joe kirchoff in ue5-main branch]
2023-05-30 18:59:32 -04:00
joe kirchoff
36d266e932 UnrealBuildTool: Automated code cleanup
#rnx
#preflight 6476799e947ff6973c225619

[CL 25693241 by joe kirchoff in ue5-main branch]
2023-05-30 18:38:07 -04:00
Chris Babcock
a7b817d8ca Upgrade Android Studio and Gradle (OpenJDK 17 from 2202.2.1 and Gradle 7.5)
#jira UE-182869
#android
#review @Jack.Porter
#rb Ben.Temple

#preflight https://horde.devtools.epicgames.com/job/6470fd1fd729def34b72a8ff

[CL 25651882 by Chris Babcock in ue5-main branch]
2023-05-26 16:03:01 -04:00
Josh Adams
e1e330be49 Fixed up Androd installation via Turnkey:
- Moved running AndroidStudio to install the commandline tools into the InstallSDKfunction, out of the Prerequisites, which now just now makes sure AndroidStudio is installed
- Added direct AndroidStudio download to Turnkey, usable by all licensees (no need to host the installer at each studio now)
#preflight 63cea450976daa618c0498ec
#rb chris.babcock

[CL 23812459 by Josh Adams in ue5-main branch]
2023-01-23 10:42:04 -05:00
chris babcock
91a9430cc8 Turnkey support for Android on Mac
#jira UE-137933
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter
#preflight https://horde.devtools.epicgames.com/job/6357e9a87261e565c46da243

[CL 22793027 by chris babcock in ue5-main branch]
2022-10-26 17:31:02 -04:00
UnrealBot
73409369c0 Branch snapshot for CL 21319338
[CL 21319338 in ue5-main branch]
2022-08-10 16:03:37 +00:00
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
josh adams
39bff31fff - Adding comments to the PlatformSDK files to note the version numbers are now in the Versions.cs files
#p4v-preflight-copy 19822331
#rb trivial
#jira none
#preflight 6261e093a21b75437128a095

[CL 19858470 by josh adams in ue5-main branch]
2022-04-21 19:26:22 -04:00
josh adams
0532d19399 - Split SDK versions into their own Versions.cs files
#rb eric.mcdaniel
#jira none
#preflight 6255a6309a0f82a3151d28aa

[CL 19723677 by josh adams in ue5-main branch]
2022-04-12 12:37:37 -04:00
Josh Adams
604aec8368 - Allow for multiple full sdks for a platform (uses a new SDKCollection class to gather sdk versions and their validityt, etc)
- Windows will be first to use it, but in a future CL, with toolchain separate from Windows SDK
- Cleaned up some of the PlatformSDK API to have fewer public members (mainly so the functions that receive multiple versions can be automatically populated with the current single version functions in the subclasses)
- Updated the Turnkey menu to handle multiple versions

#jira none
#rb david.harvey
#preflight 62508cd8f10bcc0f4fa8b5d1

[CL 19692492 by Josh Adams in ue5-main branch]
2022-04-08 15:34:51 -04:00
dmytro vovk
0eec52c49a Update AutoSDK to NDK r21e
#rb Chris.Babcock

#ROBOMERGE-AUTHOR: dmytro.vovk
#ROBOMERGE-SOURCE: CL 19456537 via CL 19456975 via CL 19458080 via CL 19460873 via CL 19462641 via CL 19462725
#ROBOMERGE-BOT: UE5 (Release-Engine-Staging -> Main) (v933-19451510)

[CL 19463646 by dmytro vovk in ue5-main branch]
2022-03-22 00:14:51 -04: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
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
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
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
Luke Thatcher
4a694b920b Move AutoSDK script version to Version.txt file inside the AutoSDK directory itself
- Previously, any changes made to AutoSDKs had to be submitted along with a bump in the version string returned by GetRequiredScriptVersionString(). Since this string is in UBT, the string has to be bumped in every branch where we need the AutoSDK changes to get applied.
 - Now, the script version string is stored in Version.txt, meaning there's only one place the version needs to be bumped to force all UBT instances in all branches to reapply an SDK.
 - Made GetRequiredScriptVersionString() private and removed platform implementations.

#rb Josh.Adams,Rolando.Caloca
#preflight 60804447a698b300013e5787

[CL 16076490 by Luke Thatcher in ue5-main branch]
2021-04-21 13:14:12 -04:00
josh adams
13682c6497 - Renamed FileRetriever class to ITurnkeyContext
- Enhanced Turnkey error reporting to the editor (TurnkeyContext now has Log and ReportError)
- Improved the SDK display in the editor
- Various bug fixes
- Renamed GetAutoSDKDirectoryForMasterVersion() to GetAutoSDKDirectoryForMainVersion()
#rb brian.white

#ROBOMERGE-SOURCE: CL 15357339 in //UE5/Release-5.0-EarlyAccess/...
#ROBOMERGE-BOT: STARSHIP (Release-5.0-EarlyAccess -> Main) (v771-15082668)

[CL 15360341 by josh adams in ue5-main branch]
2021-02-08 17:07:27 -04:00
Josh Adams
a3869f12d5 - Android Turnkey support for prerequisites (making sure Android Studio has been installed and run once sdk directory creation)
- Updated versioning to pass to SetupAndroid scripts instead of the script hardcoding it
- Added idea of code-based "FileSource" objects that can be used to install an SDK without needing to copy an installer, it's all in the SDKInstall command
- Prereqs are not working yet for Mac/Linux (logic will need to be ported on those platforms to get it right)
#rb chris.babcock

[CL 15298669 by Josh Adams in ue5-main branch]
2021-02-03 14:18:15 -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