Commit Graph

21 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
TroutZhang
05e98c9a69 PR #11394: Fix Android Studio path detection for installs from JetBrains Toolbox
#jira UE-205398
#android
[REVIEW] [at]Brandon.Schaefer
#rb Brandon.Schaefer

[CL 31057350 by TroutZhang in ue5-main branch]
2024-01-31 14:02:46 -05: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
a8432e6913 Fix clearing of ANDROID_SDK_HOME env var in SetupAndroid.bat
#jira none
#android
#review-25679082 @Chris.Babcock
#rb Chris.Babcock

#preflight none

[CL 25679080 by Chris Babcock in ue5-main branch]
2023-05-30 12:07:22 -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
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
Luke Thatcher
ee64a28f30 Copying //UE5/Dev-ParallelRendering to //UE5/Main
This change is the copy-up of work from //UE5/Dev-ParallelRendering to unify the various RHI texture types
 - The separate RHI texture types (FRHITexture2D, FRHITexture2DArray, FRHITexture3D, FRHITextureCube, FRHITextureCubeArray) have been replaced with a single type: FRHITexture.
 - Includes the required refactoring / fixes for the various platform RHIs.

The old texture types are still supported via typedefs, but will soon be marked deprecated. Future rendering code should make use of the FRHITexture type instead.

#jira UE-139559
#rb Mihnea.Balta
#preflight 622f3af819287beb2c3047f6
#robomerge[FN_ENGINEMERGE] DEV-NC

[CL 19371962 by Luke Thatcher in ue5-main branch]
2022-03-14 09:14:58 -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
aurel cordonnier
fc542f6cfd Merge from Release-Engine-Staging @ 18081189 to Release-Engine-Test
This represents UE4/Main @18073326, Release-5.0 @18081140 and Dev-PerfTest @18045971

[CL 18081471 by aurel cordonnier in ue5-release-engine-test branch]
2021-11-07 23:43:01 -05:00
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