Commit Graph

9 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
florin pascu
9ce469e211 Add new line before any echo in SetupAndroid
#jira UE-92410
#rb Brandon.Schaefer, Chris.Babcock

#ROBOMERGE-SOURCE: CL 13034767 in //UE4/Release-4.25/... via CL 13034769 via CL 13034773
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v683-13008971)

[CL 13034779 by florin pascu in Main branch]
2020-04-24 13:20:54 -04:00
chris babcock
75cc173b52 Remove check for ANDROID_HOME from Mac and Linux
Run SetupAndroid.command if SetupAndroid.sh is run on Mac instead

#jira UE-92346
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 12983953 in //UE4/Release-4.25/... via CL 12983957 via CL 12983966
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12983972 by chris babcock in Main branch]
2020-04-22 16:21:18 -04:00
brandon schaefer
2a478809cf Fix android setup script for Linux/Mac
#jira none
#rb Chris.Babcock

#ROBOMERGE-SOURCE: CL 12978854 in //UE4/Release-4.25/... via CL 12978869 via CL 12978892
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12978920 by brandon schaefer in Main branch]
2020-04-22 13:40:04 -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
brandon schaefer
2a93765bdc export PATH for Linux/Mac SetupAndroid scripts
#jira none
#android
#rb Chris.Babcock

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

[CL 11585441 by brandon schaefer in Main branch]
2020-02-22 18:15:01 -05:00
brandon schaefer
6d04247d54 SetupAndroid for Linux
#jira none
#android
#rb Chris.Babcock

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

[CL 11585433 by brandon schaefer in Main branch]
2020-02-22 18:14:54 -05:00
chris babcock
049581851e Add Mac version of SetupAndroid script
#jira none
#ue4
#android
#rb none

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

[CL 11585414 by chris babcock in Main branch]
2020-02-22 18:13:58 -05:00