Commit Graph

10 Commits

Author SHA1 Message Date
velvet22
5afad9b80a PR #8232: fix fallback location check in SetupAndroid.bat (Contributed by velvet22)
#ue5
#android
#rb trivial

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

[CL 17108140 by velvet22 in ue5-release-engine-test branch]
2021-08-09 17:36:38 -04:00
chris babcock
caf5b1ebe2 Fix SetupAndroid.bat to handle unexpected characters in user path
#jira UE-119965
#ue4
#android
#rb Brantley.Collins

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

[CL 17107916 by chris babcock in ue5-release-engine-test branch]
2021-08-09 17:18:06 -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
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
Marc Audy
11f5b21210 Merging //UE5/Release-Engine-Staging @ 13752110 to Main (//UE5/Main)
#rnx

[CL 13753156 by Marc Audy in ue5-main branch]
2020-06-23 18:40:00 -04:00
Ben Marsh
99be00dcdb Merging latest from Private-Starship.
[CL 13192225 by Ben Marsh in ue5-main branch]
2020-05-05 18:50:52 -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
b677104d28 Add alternative location for sdkmanager (moved with newer Android Studio isntalls)
#jira UE-92180
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 12905253 in //UE4/Release-4.25/... via CL 12905255 via CL 12905256
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907669 by chris babcock in Main branch]
2020-04-18 16:05:38 -04:00
john mauney
0cb8e2a7bb Fix batch file variable declaration
#jira none
#ue4
#android
#rb Chris.Babcock

#ROBOMERGE-SOURCE: CL 11558777 in //UE4/Release-4.25/... via CL 11558779
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579553 by john mauney in Main branch]
2020-02-21 17:42:15 -05:00
chris babcock
3d93697b51 Remove CodeWorks for Android and add setup batch file
#jira none
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 11558432 in //UE4/Release-4.25/... via CL 11558446
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v654-11333218)

[CL 11579545 by chris babcock in Main branch]
2020-02-21 17:42:11 -05:00