23 Commits

Author SHA1 Message Date
chris babcock
474ce22414 Upgrade to Gradle 8.7 with AGP 8.5.0 and use SDK 34 for compiling
#jira UE-222716
#android
[REVIEW] [at]dmytro.ivanov
#rb dmytro.ivanov, Rafa.Lecina

[CL 36456621 by chris babcock in 5.5 branch]
2024-09-19 18:30:33 -04:00
chris babcock
e0e7d4e08c Fix location of JAVA_HOME for Mac OS
#jira UE-193175
#android
[REVIEW] [at]Jeff.Fisher
#rb Jeff.Fisher

[CL 27148281 by chris babcock in ue5-main branch]
2023-08-16 14:24:27 -04:00
dmytro ivanov
2536e616e1 Update cmake to 3.22.1
#jira UE-192126
#rb Chris.Babcock

[CL 26894364 by dmytro ivanov in ue5-main branch]
2023-08-07 14:56:20 -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
chris babcock
17e376508f Use commandline tools 8.0 instead of latest for Android setup scripts
#jira UE-182420
#android
[REVIEW] [at]Jack.Porter
#rb Jack.Porter

#preflight n/a

[CL 24941600 by chris babcock in ue5-main branch]
2023-04-06 02:27:49 -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
andersonbisconsin
8fbacc93bd PR #9665: Add ANDROID_SDK_HOME for AGDE (Contributed by andersonbisconsin)
#jira UE-167283
#android
[REVIEW] Jack.Porter
#rb Jack.Porter

#preflight

[CL 22594083 by andersonbisconsin in ue5-main branch]
2022-10-18 00:54:48 -04:00
chris babcock
438824bcbb Enable -25 Android AutoSDK to use NDK 25b
#jira UE-166853
[REVIEW] [at]Jack.Porter
#rb Jack.Porter

#preflight https://horde.devtools.epicgames.com/job/63457b55394d5f8ebafa97f2

[CL 22472868 by chris babcock in ue5-main branch]
2022-10-11 23:32:22 -04:00
Bertrand Carre
c1c970c4fb Mac: fix installation of Android NDK throught the script SetupAndroid.command
* if default shell is zsh,  use .zprofile as well as .bash_profile (as UE is reading .bash_profile)
* make sure env variables are set up properly (prevent duplication if script was already launch)
* change rem to '#' as this was causing a warning

#jira UE-163330
#review-21918213 @Chris.Babcock @Rafa.Lecina @Adam.Kinge @Zack.Neyland
#preflight none

[CL 22072263 by Bertrand Carre in ue5-main branch]
2022-09-19 06:18:34 -04:00
chris babcock
85e722a84d Fix installed SDK components and min and max buils-tools used for Android
#jira UE-139924
#android
[REVIEW] [at]Allan.Bentham
#rb Allan.Bentham
#preflight local

#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 18901617 in //UE5/Release-5.0/... via CL 18901767 via CL 18901860
#ROBOMERGE-BOT: UE5 (Release-Engine-Test -> Main) (v912-18901109)

[CL 18901888 by chris babcock in ue5-main branch]
2022-02-08 09:46:18 -05:00
brandon schaefer
877fe86d76 Fix extra % added to ENV path
#jira none
#rb Chris.Babcock

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

[CL 15557597 by brandon schaefer in ue5-main branch]
2021-03-01 11:16:43 -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
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