Commit Graph

138 Commits

Author SHA1 Message Date
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
chris babcock
880c6af061 Fix issue with trying to copy over older obb during packaging
#jira UE-83347
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 10077443 in //UE4/Release-4.24/...
#ROBOMERGE-BOT: RELEASE (Release-4.24 -> Main) (v574-10069753)

[CL 10077445 by chris babcock in Main branch]
2019-11-07 18:17:30 -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
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
steve smith
826b51de18 Merge Dev-RenderPlat-Staging to DevVR
#jira none
#rb none

[CL 9321092 by steve smith in Dev-VR branch]
2019-10-01 16:55:06 -04:00
Marcus Wassmer
b89a1e5351 Copying //UE4/Dev-Mobile@9319092 to Dev-RenderPlat-Staging (//UE4/Dev-RenderPlat-Staging)
#rb none

[CL 9319120 by Marcus Wassmer in Dev-RenderPlat-Staging branch]
2019-10-01 14:51:40 -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
Jason Bestimt
a530f72f7d Updating from //UE4/Dev-RenderPlat-Staging to Dev-VR (//UE4/Dev-VR) to turn on robomerge
#RB:none

[CL 9106247 by Jason Bestimt in Dev-VR branch]
2019-09-25 16:05:50 -04:00
pete procopio
257610eb94 FORT-212155:Update Launcher Provider code to provide FunnelId
#jira:FORT-212155
#android
#rb:Chris.Babcock


#ROBOMERGE-SOURCE: CL 8983651 via CL 8985055 via CL 8985213
#ROBOMERGE-BOT: (v441-8974111)

[CL 8989970 by pete procopio in Main branch]
2019-09-23 16:30:34 -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
chris babcock
482a857576 Allow optional for alternative login id determination
#android
#rb Pete.Procopio



#ROBOMERGE-SOURCE: CL 8376640 via CL 8376641 via CL 8376642 via CL 8377377 via CL 8380717
#ROBOMERGE-BOT: (v402-8361577)

[CL 8380781 by chris babcock in Main branch]
2019-08-29 19:59:52 -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
pete procopio
7d659812df FORT-192662:Add ability to use Launcher ContentProviderand to get CommandLine and Install Type for AppsFlyer
#jira:FORT-192662
#android
#kairos


#ROBOMERGE-SOURCE: CL 7615728 via CL 7616480 via CL 7616516 via CL 7624236
#ROBOMERGE-BOT: (v372-7473910)

[CL 7624414 by pete procopio in Main branch]
2019-07-25 10:21:31 -04:00
chris babcock
cce9b4bd31 Expose isEmbedded to UPL (Android-only)
#android
#ue4
[FYI] Trever.Stone
#rb none



#ROBOMERGE-SOURCE: CL 7477001 via CL 7492383 via CL 7544973
#ROBOMERGE-BOT: (v372-7473910)

[CL 7545203 by chris babcock in Main branch]
2019-07-23 10:49:15 -04:00
chris babcock
74d3984078 Fix staging of libUE4.so for Ant builds on Android
#jira UE-77021
#ue4
#android
[FYI] Jack.Porter
#rb Thomas.Ross

#ROBOMERGE-SOURCE: CL 7476684 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v372-7473910)

[CL 7476685 by chris babcock in Main branch]
2019-07-22 13:56:06 -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
chris babcock
5dcfc7d7bf Add support for store version offset by architecture
#jira UE-67565
#ue4
#android
[FYI] Jack.Porter
#rb Thomas.Ross

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

[CL 7434548 by chris babcock in Main branch]
2019-07-17 19:00:37 -04:00
francois guimond
7d276102ff Scheduled local notifications on Android will now persist across reboots like on iOS.
Commiting changes from post-commit review.
#rnx
#rb Chris.Babcock, Pete.Procopio


#ROBOMERGE-SOURCE: CL 7265680 via CL 7271181
#ROBOMERGE-BOT: (v369-7254125)

[CL 7271330 by francois guimond in Main branch]
2019-07-10 21:32:14 -04:00
andrew grant
27d52fe5cc Fix .sln generation for VSMac
#jira #rb na

#ROBOMERGE-SOURCE: CL 7235077 in //UE4/Release-4.23/...
#ROBOMERGE-BOT: RELEASE (Release-4.23 -> Main) (v367-6836689)

[CL 7235078 by andrew grant in Main branch]
2019-07-08 20:33:06 -04:00
francois guimond
8a8e42fe2a Scheduled local notifications on Android will now persist across reboots like on iOS.
#rnx


#ROBOMERGE-SOURCE: CL 7224721 via CL 7224759
#ROBOMERGE-BOT: (v367-6836689)

[CL 7224764 by francois guimond in Main branch]
2019-07-05 14:35:32 -04:00
chris babcock
14547a1d0d Add option for public logs on Android
#ue4
#android
[FYI] Jack.Porter,Andrew.Grant
#rb Peter.Sauerbrei



#ROBOMERGE-SOURCE: CL 7113141 via CL 7113144 via CL 7165976
#ROBOMERGE-BOT: (v367-6836689)

[CL 7166205 by chris babcock in Main branch]
2019-06-21 23:50:54 -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