Commit Graph

169 Commits

Author SHA1 Message Date
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
josh adams
242106c274 - Another android link attempt, this one linked in all 3 configs on EC
#rb chris.babcock
[FYI] chris.babcock
#rnx


#ROBOMERGE-OWNER: josh.adams
#ROBOMERGE-AUTHOR: josh.adams
#ROBOMERGE-SOURCE: CL 12249951 via CL 12249994
#ROBOMERGE-BOT: (v668-12245121)

[CL 12250003 by josh adams in Main branch]
2020-03-18 14:57:45 -04:00
chris babcock
dd83c15367 Fix arm64 non-debug flags for -fdata-sections
#jira FORT-270813
#ue4
#android
[FYI] Josh.Adams
#rb Josh.Adams


#ROBOMERGE-OWNER: chris.babcock
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 12239693 in //UE4/Release-4.25/... via CL 12239694
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12239732 by chris babcock in Main branch]
2020-03-18 00:01:00 -04:00
chris babcock
4163e49f74 Fix broken changelist as version
#jira none
#ue4
#android
[FYI] Michael.Sartain
#rb trivial

#ROBOMERGE-SOURCE: CL 12237191 in //UE4/Release-4.25/... via CL 12237196
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v664-12234175)

[CL 12239493 by chris babcock in Main branch]
2020-03-17 23:19:34 -04:00
michael sartain
43ef13a97b Fix UnrealBuildTool unused variable warnings
#jira none
#rb Ben.Marsh
[FYI] Andrew.Grant, Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12224860 in //UE4/Release-4.25/... via CL 12224862
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v663-12210973)

[CL 12224868 by michael sartain in Main branch]
2020-03-16 19:04:42 -04:00
chris babcock
b30c97e125 Added more control over Gradle project
- ANDROID_TOOLS_BUILD_GRADLE_VERSION may be set in gradle.properties by <gradleProperties> in UPL
- settings.gradle may be added to with <settingsGradleAdditions> in UPL

#jira UE-90616
#ue4
#android
[FYI] Jack.Porter
#rb trivial

#ROBOMERGE-SOURCE: CL 12161607 in //UE4/Release-4.25/... via CL 12161609
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v661-12148976)

[CL 12161611 by chris babcock in Main branch]
2020-03-13 06:48:04 -04:00
ben marsh
09ca12ccef Refactor UBT to use an interface (IActionGraphBuilder) to construct the action graph. Response files are also constructed through this interface, allowing them to be tracked as dependencies (will be added in subsequent change).
#rb none
#jira

#ROBOMERGE-SOURCE: CL 12038895 in //UE4/Release-4.25/... via CL 12038911
#ROBOMERGE-BOT: RELEASE (Release-4.25Plus -> Main) (v657-12064184)

[CL 12076066 by ben marsh in Main branch]
2020-03-09 13:20:14 -04:00
jack porter
daebcd1a11 Fix Android arch excluding for lib paths that specify arch and version
#rb none
[FYI] Chris.Babcock


#ROBOMERGE-SOURCE: CL 12058353 via CL 12058356 via CL 12058359 via CL 12058363
#ROBOMERGE-BOT: (v656-11643781)

[CL 12058365 by jack porter in Main branch]
2020-03-09 05:35:46 -04:00
jack porter
9a7c32c36b Unblocking Robomerge for "Add gameActivityForceQuitAdditions to allow android plugins to be notified when an application requests to quit."
#rb chris.babcock
#rnx
#fyi Allan.Bentham

#ROBOMERGE-OWNER: jack.porter
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 12000213 via CL 12000756 via CL 12002284 via CL 12005787
#ROBOMERGE-BOT: (v656-11643781)

[CL 12048213 by jack porter in Main branch]
2020-03-07 05:52:12 -05:00
jack porter
43a53900fb Google Game SDK
#jira UE-80047
#rb Allan.Bentham


#ROBOMERGE-SOURCE: CL 12000182 via CL 12000719 via CL 12002266 via CL 12005770
#ROBOMERGE-BOT: (v656-11643781)

[CL 12048170 by jack porter in Main branch]
2020-03-07 05:47:15 -05:00
allan bentham
b457410244 Add option for android crash context to not write log when storing crashinfo.
Add gameActivityOnRestartApplicationAdditions to allow plugins to get notice of app restart requests.
#rb chris.babcock
#rnx


#ROBOMERGE-OWNER: allan.bentham
#ROBOMERGE-AUTHOR: allan.bentham
#ROBOMERGE-SOURCE: CL 11894983 via CL 11894984 via CL 11894986
#ROBOMERGE-BOT: (v656-11643781)

[CL 11895006 by allan bentham in Main branch]
2020-03-04 06:55:54 -05: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
6df461dc0d Provide more control over OBB selection
#jira UE-89810
#ue4
#android
#rb Brandon.Schaefer

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

[CL 11792949 by chris babcock in Main branch]
2020-02-28 20:20:36 -05:00
chris babcock
c3e14aa762 Add option to force use of legacy ld instead of lld for Android
#jira UE-89634
#ue4
#android
#rb Jack.Porter


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

[CL 11646391 by chris babcock in Main branch]
2020-02-26 22:08:53 -05:00
chris babcock
acfe9391e3 Fix NDK20 fallback tool paths for some architectures and disable ld.gold for ARM64
#jira UE-89658
#ue4
#android
#rb trivial

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

[CL 11645565 by chris babcock in Main branch]
2020-02-26 20:48:49 -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
RPG3D
283ed217a6 Ignore empty AAR directories on Android (contributed by RPG3D)
#jira UE-88492
#PR #6676
#ue4
#android
#rb trivial


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

[CL 11577525 by chris babcock in Main branch]
2020-02-21 14:03:55 -05:00
RPG3D
01606cdb58 Ignore empty AAR directories on Android (contributed by RPG3D)
#jira UE-88492
#PR #6676
#ue4
#android
#rb trivial


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

[CL 11520944 by chris babcock in 4.25-Plus branch]
2020-02-18 16:47:09 -05:00
andrew grant
fe6bf6d6a0 Make sure libgnustl_shared is writable in intermediates folder.
#tests Android builds from AutoSDK can now be cleaned.

[FYI] chris.babcock


#ROBOMERGE-SOURCE: CL 11507176 via CL 11507199 via CL 11507207
#ROBOMERGE-BOT: (v654-11333218)

[CL 11507215 by andrew grant in Main branch]
2020-02-18 13:27:37 -05:00
chris babcock
2753dde55a Update BundleTool to 0.13.0
#jira UE-88929
#ue4
#android
#rb Tyler.Quinn

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

[CL 11467815 by chris babcock in 4.25-Plus branch]
2020-02-17 17:23:22 -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
Rolando Caloca
bbb9564388 Copying //UE4/Dev-RenderPlat-Staging@11110326 to //UE4/Main
#rb none
#rnx

[CL 11110369 by Rolando Caloca in Main branch]
2020-01-24 18:07:01 -05:00
Rolando Caloca
db7cb13cd5 Merging //UE4/Main@11108668 to Dev-RenderPlat-Staging
#rb none
#rnx

[CL 11109810 by Rolando Caloca in Dev-RenderPlat-Staging branch]
2020-01-24 17:26:14 -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