6 Commits

Author	SHA1	Message	Date
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