Commit Graph

114 Commits

Author SHA1 Message Date
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
51e3a6fb84 UBT: Track any reads from config files, so we can more accurately detect when they've been modified. Some config files are modified whenever the editor is started, causing the makefile to be invalidated unnecessarily.
#rb none
#jira UE-73197

[CL 6911205 by Ben Marsh in Main branch]
2019-06-10 11:09:30 -04:00
chris babcock
3abf09386f Add MD5 hash check of Android build template files to invalidate intermedate source
#ue4
#android
[FYI] Jack.Porter,Justin.Marcus
#rb Justin.Marcus



#ROBOMERGE-SOURCE: CL 6866078 via CL 6866642 via CL 6868071
#ROBOMERGE-BOT: (v366-6836689)

[CL 6868169 by chris babcock in Main branch]
2019-06-06 17:25:10 -04:00
pete procopio
ff4f797370 FORT-179522: Error: incompatible types: int cannot be converted to String in DownloadShim.java generated by UEDeployAndroid.cs
#jira:FORT-179522
[FYI] Chris.Babcock
#android



#ROBOMERGE-SOURCE: CL 6675769 via CL 6675771 via CL 6675774 via CL 6675776 via CL 6675778 via CL 6678176
#ROBOMERGE-BOT: (v363-6677109)

[CL 6678287 by pete procopio in Main branch]
2019-05-30 15:31:03 -04:00
chris babcock
a44d2c2b60 Fix version checked for OBB to always match manifest version code
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 6672175 via CL 6672194 via CL 6672197 via CL 6672201 via CL 6672203 via CL 6673471
#ROBOMERGE-BOT: (vundefined-6665479)

[CL 6674115 by chris babcock in Main branch]
2019-05-29 23:53:16 -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
chris babcock
1ce0740a65 Add support for embedded builds to optionally append to DisplayName on Android
Provide optional second Gradle invocation after APK generated

#android
#rb Peter.Sauerbrei



#ROBOMERGE-SOURCE: CL 6451020 via CL 6451037 via CL 6451873

[CL 6451943 by chris babcock in Main branch]
2019-05-14 15:30:43 -04:00
chris babcock
5133736352 Run addtional Gradle targets as separate call to start with fresh heap
#android


#ROBOMERGE-SOURCE: CL 6422987 via CL 6422988 via CL 6423067 via CL 6423069 via CL 6423590

[CL 6423610 by chris babcock in Main branch]
2019-05-12 13:12:49 -04:00
chris babcock
51918aefba Add support for UPL to insert a finalizing section at end of onCreate (gameActivityOnCreateFinalAdditions)
Optionally append to version name from an environment variable (UEAndroidDisplayNameExtra)

#android
[FYI] Andrew.Grant
#rb Pete.Procopio



#ROBOMERGE-SOURCE: CL 6278852 via CL 6278853 via CL 6289873

[CL 6290342 by chris babcock in Main branch]
2019-05-03 17:54:31 -04:00
chris babcock
c1b8a3caaf Handle required permissions at startup in SplashActivity with better flexiblity
#ue4
#android
[FYI] Pete.Procopio,Michael.Kirzinger,Jack.Porter
#rb Pete.Procopio



#ROBOMERGE-SOURCE: CL 6265053 via CL 6265056 via CL 6265059 via CL 6273019

[CL 6273099 by chris babcock in Main branch]
2019-05-03 10:01:29 -04:00
chris babcock
36abe6bc37 Add option to split OBB into main and patch if exceeds OBB size limit
#ue4
#android
[FYI] Jack.Porter
#rb Dmitriy.Dyomin



#ROBOMERGE-SOURCE: CL 6103655 via CL 6103711 via CL 6103784

[CL 6103790 by chris babcock in Main branch]
2019-04-25 23:36:29 -04:00
Chris Babcock
aa6a966ce8 Disable GameApplication for Android projects still using Ant
#jira UE-73246
#android
#rb trivial

[CL 6087322 by Chris Babcock in Main branch]
2019-04-24 18:23:42 -04:00
chris babcock
3ecf024c95 Add optional handling of activity resize events for Android
#android
[CODEREVIEW] Jack.Porter
#rb Thomas.Ross



#ROBOMERGE-SOURCE: CL 5997765 via CL 5997766 via CL 5998630 via CL 5998669 via CL 6002850

[CL 6003042 by chris babcock in Main branch]
2019-04-18 21:44:00 -04:00
chris babcock
6804400e3a Create directory for packageInfo.txt if doesn't exist
#jira UE-72254
#ue4
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 5831134 via CL 5831548 via CL 5835487

[CL 5836286 by chris babcock in Main branch]
2019-04-12 10:10:09 -04:00
chris babcock
9abbedc908 Catch warnings during cleaning phase with Gradle
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 5814758 via CL 5814760 via CL 5814761 via CL 5817041

[CL 5817048 by chris babcock in Main branch]
2019-04-09 21:28:15 -04:00
chris babcock
5486ea99a2 Add some more Gradle warnings to sanitize
#android
#rb trivial



#ROBOMERGE-SOURCE: CL 5808669 via CL 5808671 via CL 5808672 via CL 5811662

[CL 5811900 by chris babcock in Main branch]
2019-04-09 16:18:32 -04:00
chris babcock
0126edebff Allow actions to be inserted whenever software keyboard opened or closed on Android
#ue4
#android
#rb none



#ROBOMERGE-SOURCE: CL 5715224 via CL 5715228 via CL 5715231 via CL 5715237 via CL 5717587

[CL 5717686 by chris babcock in Main branch]
2019-04-03 20:23:44 -04:00
chris babcock
a575857724 Add gameActivityAfterMainViewCreatedAdditions to GameActivity.java.template
#android
[FYI] Peter.Procopio
#rb none



#ROBOMERGE-SOURCE: CL 5677353 via CL 5677355 via CL 5677357 via CL 5677359 via CL 5677910

[CL 5677916 by chris babcock in Main branch]
2019-04-01 20:59:30 -04:00
chris babcock
7c4cab5ce5 Set target sdk properties on subprojects to prevent unwanted permissions being added automatically
#ue4
#android
[REVIEW]
#rb Peter.Procopio


#ROBOMERGE-OWNER: chris.babcock
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 5633430 via CL 5633681 via CL 5633682 via CL 5633683 via CL 5633686 via CL 5634362

[CL 5634486 by chris babcock in Main branch]
2019-03-28 15:24:27 -04:00
chris babcock
7d9653d3fa Fix logging of store version
#rb none
[FYI] Andrew.Grant


#ROBOMERGE-SOURCE: CL 5481418 via CL 5481426 via CL 5484531

[CL 5484535 by chris babcock in Main branch]
2019-03-20 16:18:32 -04:00
andrew grant
aad734a79d Added some logging around Android symbol generaton
#ROBOMERGE-SOURCE: CL 5469194 via CL 5469197 via CL 5470751

[CL 5470757 by andrew grant in Main branch]
2019-03-20 12:21:16 -04:00
pete procopio
37a562e43a Allow dynamic library as target for finalizing Android project
#ue4
#android
#rb Chris.Babcock
[FYI] Chris.Babcock



#ROBOMERGE-SOURCE: CL 5420722 via CL 5427997

[CL 5428139 by pete procopio in Main branch]
2019-03-18 11:33:55 -04:00
chris babcock
28d62c516c Fix issue with changelist as store version update ordering
#ue4
#android
#rb Josh.Adams



#ROBOMERGE-SOURCE: CL 5370883 via CL 5370885 via CL 5374861

[CL 5378024 by chris babcock in Main branch]
2019-03-12 23:22:42 -04:00
Andrew Grant
da2cbfff1f Merging 5360223 from Dev-EngineMerge. DevK integration.
#rb #jira na

[CL 5361784 by Andrew Grant in Main branch]
2019-03-11 15:12:02 -04:00
chris babcock
5443bb063a More fallout of merge in GameActivity
- added GameApplication, network change notifications, Firebase, and lifecycle

#android
#rb Pete.Procopio



#ROBOMERGE-SOURCE: CL 5232162 via CL 5238945

[CL 5239022 by chris babcock in Main branch]
2019-02-28 11:31:08 -05:00