Commit Graph

62 Commits

Author SHA1 Message Date
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
ben marsh
9170b5f44a Enable shadow variable warnings as errors by default for projects that are using the latest UBT build settings. Allow setting the warning/error level on a per-module and per-target basis.
The engine will always be built with it as an error.

#rb none
[FYI] Marc.Audy
#jira none

#ROBOMERGE-SOURCE: CL 9839163 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v546-9757112)

[CL 9839167 by ben marsh in Main branch]
2019-10-25 10:39:37 -04:00
Ryan Vance
a05748cb7b Copying //UE4/Partner-MagicLeap-Staging to Dev-VR (//UE4/Dev-VR)
#rb integration
Magic Leap 0.22 SDK integration

[CL 9310486 by Ryan Vance in Dev-VR branch]
2019-09-30 20:02:41 -04:00
joe conley
48630bfb08 Copying //UE4/Dev-RenderPlat-Staging[at]8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

#ROBOMERGE-OWNER: ryan.vance
#ROBOMERGE-AUTHOR: marcus.wassmer
#ROBOMERGE-SOURCE: CL 8684840 in //UE4/Main/...
#ROBOMERGE-BOT: DEVVR (Main -> Dev-VR) (v425-8812723)

[CL 8833334 by joe conley in Dev-VR branch]
2019-09-18 13:36:13 -04:00
steve smith
e7034f8513 Oculus updates, merged from partner-oculus-staging.
#rb ryan.vance steve.smith
#jira none

[CL 8832458 by steve smith in Dev-VR branch]
2019-09-18 13:19:12 -04:00
Marcus Wassmer
6517c68ef5 Copying //UE4/Dev-RenderPlat-Staging@8684824 to Dev-Main (//UE4/Dev-Main)
#rb none

[CL 8684840 by Marcus Wassmer in Main branch]
2019-09-14 09:45:25 -04:00
Joakim Lindqvist
5dfc711a1f Add warning when referencing a module without a fully qualifed path, doing so will break the incremental building of it.
Added SystemLibrary list you can use if you actually need to add a module without a fully qualified path and dont want to see this warning (should not be needed in most cases)

Also updated the android toolchain to filter paths to a library in the same way a additional library search path is filtered enabling us to just specify the full path to multiple libraries for different architectures.

#jira UE-54890
#review-7867830 ben.marsh
#rb none

[CL 7918850 by Joakim Lindqvist in Dev-Build branch]
2019-08-09 03:47:21 -04:00
chris babcock
99aa77481c Disable Oculus plugins on Android X64
#jira UE-77647
#ue4
#android
[CODEREVIEW] Keli.Hlodversson
#rb Keli.Hlodversson

#ROBOMERGE-SOURCE: CL 7462653 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v371-7306989)

[CL 7462661 by chris babcock in Main branch]
2019-07-19 16:02:28 -04:00
Jeff Fisher
bcc5bcf128 Copying //UE4/Dev-VR to Main (//UE4/Main)
-Copy up for 4.23
#rb none

[CL 6911980 by Jeff Fisher in Main branch]
2019-06-10 12:22:13 -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
nick whiting
c6c27e3c20 Fix for needing the NDK installed for building Lumin / Magic Leap projects. Added bypass the to NDK version check if bAllowMissingNDK. Opted to not early out in case other Android functionality that Lumin needs is added afterwards.
#jira UE-70219
#rb joe.conley
[FYI] chris.babcock

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

[CL 5058304 by nick whiting in Main branch]
2019-02-18 20:52:44 -05:00
Ryan Vance
d5aa052fe5 Copying //UE4/Dev-VR to Dev-Main (//UE4/Dev-Main) Souce CL: 4824152
#lockdown: Nick.Penwarden
#rb Integration

[CL 4824851 by Ryan Vance in Main branch]
2019-01-28 16:31:25 -05:00
chris babcock
56830d11c2 Validate Android NDK before before compiling
#jira UE-68866
#ue4
#android
[FYI] Jack.Porter
#rb John.Mauney



#ROBOMERGE-SOURCE: CL 4805920 via CL 4805924 via CL 4805926 via CL 4808586

[CL 4808710 by chris babcock in Main branch]
2019-01-25 04:26:26 -05:00
Rob Gay
7df0b8c4ff Copying //UE4/Dev-Audio to Dev-Main (//UE4/Dev-Main) Souce CL: 4806741
#rb aaron.mcleran
#lockdown aaron.mcleran

[CL 4806765 by Rob Gay in Main branch]
2019-01-24 20:58:09 -05:00
Chris Babcock
65b4fa9211 Fix issue with compiler executable paths with spaces on Android
#jira UE-68380
#ue4
#android
#fyi Jack.Porter
#rb Jack.Porter

[CL 4738473 by Chris Babcock in Main branch]
2019-01-16 22:00:29 -05:00
Ben Marsh
3563b58e3e Fix command line arguments not being split by delimiter characters, and revert CL 4737886.
#rb none
#fyi Chris.Babcock

[CL 4738035 by Ben Marsh in Main branch]
2019-01-16 20:06:35 -05:00
Chris Babcock
41bfa2640b Fix issue with -Architectures and GPUArchitectures not being split properly
#jira UE-68518
#ue4
#android
#fyi Ben.Marsh
#rb John.Mauney

[CL 4737886 by Chris Babcock in Main branch]
2019-01-16 19:29:34 -05:00
Ben Marsh
f65783f917 UBT: Remove the bIsUsingPCH flag from each action. This isn't used for anything useful any more.
#rb none
#rnx

[CL 4730592 by Ben Marsh in Dev-Build branch]
2019-01-15 19:38:53 -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
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
Francis Hurteau
57c677da93 Copying //UE4/Dev-Enterprise@4705006 to Dev-Main (//UE4/Dev-Main)
#rb none
#lockdown Nick.Penwarden

[CL 4705151 by Francis Hurteau in Main branch]
2019-01-10 17:26:53 -05:00
Ben Marsh
f2817835a7 Fix accidental change to assignment order causing Lumin link errors.
#rb none
#rnx

[CL 4674746 by Ben Marsh in Dev-Build branch]
2018-12-27 13:37:29 -05:00
Ben Marsh
e27789c8e4 Fix Lumin CIS errors. Tool paths are quoted if they are passed on the command line, rather than globally.
#rb none
#rnx

[CL 4674742 by Ben Marsh in Dev-Build branch]
2018-12-27 12:58:29 -05:00
Ben Marsh
74759b57fa UBT: Remove environment variable expansion from executors. Individual toolchains already do this if necessary, and the current implementation is not universally supported.
#rb none
#rnx

[CL 4674734 by Ben Marsh in Dev-Build branch]
2018-12-27 11:53:57 -05:00