Commit Graph

181 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
chris babcock
5f70ec1e68 Fix typo
#jira none
#ue4
#android
#rb trivial

#ROBOMERGE-SOURCE: CL 12900348 in //UE4/Release-4.25/... via CL 12900366 via CL 12900380
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907100 by chris babcock in Main branch]
2020-04-18 15:55:56 -04:00
chris babcock
b42f704352 Allow -armv7 etc on -architectures for Android in UBT
#jira UE-92110
#ue4
#android
#rb Florin.Pascu

#ROBOMERGE-SOURCE: CL 12900306 in //UE4/Release-4.25/... via CL 12900310 via CL 12900312
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v682-12900288)

[CL 12907099 by chris babcock in Main branch]
2020-04-18 15:55:54 -04:00
chris babcock
826d93d62e Check for change in active plugins on Android and clean Intermediate/Android if necessary to prevent packaging failures
#jira UE-92126
#ue4
#android
#rb Brandon.Schaefer

#ROBOMERGE-SOURCE: CL 12873795 in //UE4/Release-4.25/... via CL 12873798 via CL 12873801
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12873807 by chris babcock in Main branch]
2020-04-16 17:27:12 -04:00
chris babcock
55b8d1e0fc Set a new minimum SDK level for Android using Gradle
#jira UE-92113
#ue4
#android
#rb John.Mauney

#ROBOMERGE-SOURCE: CL 12871574 in //UE4/Release-4.25/... via CL 12871581 via CL 12871589
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v681-12776863)

[CL 12871595 by chris babcock in Main branch]
2020-04-16 15:48:20 -04:00
ben marsh
af150afdbe Fix path to Android keystore causing build failures.
[FYI] Josh.Adams

#ROBOMERGE-SOURCE: CL 12766499 via CL 12766503 via CL 12766504
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12766506 by ben marsh in Main branch]
2020-04-13 17:31:02 -04:00
chris babcock
a90f080e9c Disable --gc-sections on link if not compiling with -ffunction-sections and -fdata-sections for Android
#android
[FYI] Jack.Porter
#rb trivial


#ROBOMERGE-SOURCE: CL 12759487 via CL 12759490 via CL 12759492
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v678-12743200)

[CL 12759498 by chris babcock in Main branch]
2020-04-13 14:02:53 -04:00
josh adams
13bc36c98d Moving Binaries and Build NotForLicensees files around
#rb ben.marsh

#ROBOMERGE-SOURCE: CL 12740027 via CL 12740029 via CL 12740030
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12740031 by josh adams in Main branch]
2020-04-11 08:47:06 -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
25f0cf8528 Fix -shared flag so sent to clang instead of passed only to linker
#jira UE-91820
#ue4
#android
#rb Trevor.Stone

#ROBOMERGE-SOURCE: CL 12714250 in //UE4/Release-4.25/... via CL 12714252 via CL 12714257
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12714261 by chris babcock in Main branch]
2020-04-09 21:18:13 -04:00
florin pascu
3f209910fb Fix for universal apk appbundle crashing in WriteAllLines because file is in use
#jira UE-91779
#rb  Chris.Babcock
#lockdown cristina.riveron

#ROBOMERGE-SOURCE: CL 12690557 in //UE4/Release-4.25/... via CL 12690559 via CL 12690568
#ROBOMERGE-BOT: RELEASE (Release-Engine-Staging -> Main) (v676-12543919)

[CL 12690583 by florin pascu in Main branch]
2020-04-09 11:50:37 -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
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