Commit Graph

60 Commits

Author SHA1 Message Date
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
Ben Marsh
d6d7c939e5 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 12726184 by Ben Marsh in Main branch]
2020-04-10 11:30:32 -04:00
chris babcock
0d107b1102 Unshelved from pending changelist '12670438':
Fix up Android NDK 21 merge differences and native issues

#jira FORT-275902
#android
[FYI] Ben.Temple
#rb Jack.Porter


#ROBOMERGE-OWNER: chris.babcock
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 12670408 via CL 12670410 via CL 12670462
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v675-12543919)

[CL 12671919 by chris babcock in Main branch]
2020-04-08 10:10:06 -04:00
chris babcock
b29a250c87 Fix issues with stdlib and x86_64 linking
#jira UE-89957,UE-90022
#ue4
#android
[FYI] Jack.Porter
#rb Jack.Porter

#ROBOMERGE-SOURCE: CL 12504708 in //UE4/Release-4.25/... via CL 12504709 via CL 12504729
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v673-12478461)

[CL 12504762 by chris babcock in Main branch]
2020-04-01 05:00:44 -04:00
carl lloyd
a745d7eb86 Removed ATC/ETC1 and Android PVR texture formats
[at]Chris.babcock [at]Jack.porter
[FYI] [at]Rolando.Caloca [at]Luke.Thatcher
#rb Chris.babcock, Jack.porter, Rolando Caloca
#jira none

#ROBOMERGE-SOURCE: CL 11825686 in //UE4/Release-4.25/... via CL 11825740
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v656-11643781)

[CL 11825801 by carl lloyd in Main branch]
2020-03-02 11:26:01 -05:00
chris babcock
89806504ee Update Android toolchain to NDK 21 (20 also supported for x86_64) additional files
#jira UE-80046
#ue4
#android
#rb Bradon.Schaefer


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

[CL 11578380 by chris babcock in Main branch]
2020-02-21 15:19:40 -05:00
Rolando Caloca
5b82f15def Copying //UE4/Dev-RenderPlat-Staging@11388153 to //UE4/Main
#rb none
#rnx

[CL 11388545 by Rolando Caloca in Main branch]
2020-02-12 13:27:19 -05:00
chad garyet
21ba436420 enable xge for android builds
#rb none
[FYI] chris.babcock ryan.durand bob.tellez


#ROBOMERGE-SOURCE: CL 11077262 via CL 11077266 via CL 11077267
#ROBOMERGE-BOT: (v637-11041722)

[CL 11077269 by chad garyet in Main branch]
2020-01-21 16:49:41 -05:00
benn gallagher
f002edbaea Disable ISPC on Android as Neon code generation seems to produce incorrect code. Transformed AABBs were garbage after going through ISPC causing queries to fail often in Chaos.
#jira
#rb none


#ROBOMERGE-SOURCE: CL 11067004 via CL 11067007 via CL 11067008 via CL 11067010
#ROBOMERGE-BOT: (v637-11041722)

[CL 11067012 by benn gallagher in Main branch]
2020-01-20 15:09:58 -05:00
Ryan Durand
9ef3748747 Updating copyrights for Engine Programs.
#rnx
#rb none
#jira none

#ROBOMERGE-OWNER: ryan.durand
#ROBOMERGE-AUTHOR: ryan.durand
#ROBOMERGE-SOURCE: CL 10869242 in //Fortnite/Release-12.00/... via CL 10869536
#ROBOMERGE-BOT: FORTNITE (Main -> Dev-EngineMerge) (v613-10869866)

[CL 10870955 by Ryan Durand in Main branch]
2019-12-26 23:01:54 -05:00
michael lentine
f302c5d5fc Add cross platform ISPC support from Dev-Anim to accelerate Chaos computations.
#rb Ben.Marsh


#ROBOMERGE-OWNER: michael.lentine
#ROBOMERGE-AUTHOR: michael.lentine
#ROBOMERGE-SOURCE: CL 10727300 via CL 10727303 via CL 10727314 via CL 10727316
#ROBOMERGE-BOT: (v610-10636431)

[CL 10727317 by michael lentine in Main branch]
2019-12-13 23:35:01 -05:00
marc audy
cfce5dd9ac Submit of Josh Adams' restructuring of platform handling in UBT
[FYI] Josh.Adams


#ROBOMERGE-SOURCE: CL 10590881
#ROBOMERGE-BOT: (v607-10590470)

[CL 10590882 by marc audy in Main branch]
2019-12-06 09:16:21 -05:00
chris babcock
2b59710833 Fix issue with PLATFORM_USED_NDK_VERSION_INTEGER and show proper NDK level used for compile
#android
[FYI] Allen.Bentham
#rb Allan.Bentham



#ROBOMERGE-SOURCE: CL 10351503 via CL 10357277 via CL 10357363
#ROBOMERGE-BOT: (v594-10333955)

[CL 10361767 by chris babcock in Main branch]
2019-11-21 17:16:05 -05:00
Rolando Caloca
1a30325d6f Copying //UE4/Dev-RenderPlat-Staging@9551419 to //UE4/Main
#rb none
#rnx

[CL 9551447 by Rolando Caloca in Main branch]
2019-10-11 15:33:31 -04:00
Ben Marsh
0cc6e3dca6 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 6631504 by Ben Marsh in Main branch]
2019-05-24 11:51:54 -04:00
Josh Adams
d0bf843c9c - Merging Dev-Kairos/Engine/... to Main/Engine/...
- Brings over the necessary engine changes for embedding UE4 mobile as a dylib/so in native mobile app
- Various changes for facial animation, screen recording, others
- ARKit and ARCore plugins were removed, as deemed "not ready"
#rb many people


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 5201138 via CL 5203024

[CL 5226277 by Josh Adams in Main branch]
2019-02-27 11:57:17 -05:00
brandon schaefer
a4efd5ed9b Disable XGE when building on Linux for Android
#jira UE-69732
#rb Arciel.Rekman

#ROBOMERGE-SOURCE: CL 4936860 in //UE4/Release-4.22/...
#ROBOMERGE-BOT: RELEASE (Release-4.22 -> Main)

[CL 4936862 by brandon schaefer in Main branch]
2019-02-07 13:32:06 -05:00
James Hopkin
a9f7efc154 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

#ROBOMERGE-SOURCE: CL 4718806

[CL 4732416 by James Hopkin in Dev-Core branch]
2019-01-16 10:11:46 -05:00
Robert Manuszewski
cfa01c09c7 Merging //UE4/Dev-Main to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4731457 by Robert Manuszewski in Dev-Core branch]
2019-01-16 04:23:12 -05:00
Ben Marsh
a22b952aa9 Copying //UE4/Dev-Build to Dev-Main (//UE4/Dev-Main)
#rb none
#rnx

[CL 4718806 by Ben Marsh in Main branch]
2019-01-14 12:11:24 -05:00
Ben Marsh
23a9f020fe Fix compile errors in UBT after merge
#rb none
#rnx

[CL 4716251 by Ben Marsh in Dev-Build branch]
2019-01-12 13:10:27 -05:00
Thomas Sarkanen
b709a10f4c Merging //UE4/Dev-Main to Dev-Anim (//UE4/Dev-Anim) @ CL 4708558
#rb none
#jira none
#lockdown Laurent.Delayen

[CL 4708630 by Thomas Sarkanen in Dev-Anim branch]
2019-01-11 07:37:39 -05:00
Ben Marsh
129aac0526 Merging //UE4/Dev-Main to Dev-Build (//UE4/Dev-Build)
#rb none
#rnx

[CL 4706788 by Ben Marsh in Dev-Build branch]
2019-01-10 20:03:35 -05:00
Jurre deBaare
8fc9b7e60e Removed thirdparty modules and dependencies
#jira UE-65642
#rb none

[CL 4691986 by Jurre deBaare in Dev-Anim branch]
2019-01-09 06:58:40 -05:00
Robert Manuszewski
2752c82adc Merging //UE4/Dev-Main @ 4664414 to Dev-Core (//UE4/Dev-Core)
#rb none

[CL 4675693 by Robert Manuszewski in Dev-Core branch]
2019-01-02 00:55:51 -05:00