izzy/UnrealEngineUWP
0
0
Fork 0
mirror of https://github.com/izzy2lost/UnrealEngineUWP.git synced 2026-03-26 18:15:20 -07:00
Code Issues Packages Projects Releases Wiki Activity

Add support for UPL to insert a finalizing section at end of onCreate (gameActivityOnCreateFinalAdditions)

Browse Source 
Optionally append to version name from an environment variable (UEAndroidDisplayNameExtra)

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


#ROBOMERGE-OWNER: ben.marsh
#ROBOMERGE-AUTHOR: chris.babcock
#ROBOMERGE-SOURCE: CL 6278852 via CL 6278853 via CL 6289873 via CL 6290342
#ROBOMERGE-BOT: BUILD (Main -> Dev-Build)

[CL 6303444 by chris babcock in Dev-Build branch]
This commit is contained in:
chris babcock
2019-05-03 21:17:30 -04:00
parent 6da2982d33
commit 0e737efe84
2 changed files with 9 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Engine/Build/Android/Java/src/com/epicgames/ue4/GameActivity.java.template
View File

@@ -2950,6 +2950,7 @@ public class GameActivity extends $${gameActivitySuperClass}$$ implements Surfac
clipboardManager = (ClipboardManager) getSystemService(CLIPBOARD_SERVICE);
//$${gameActivityOnCreateAdditions}$$
//$${gameActivityOnCreateFinalAdditions}$$
Log.debug("==============> GameActive.onCreate complete!");
}

8
Engine/Source/Programs/UnrealBuildTool/Platform/Android/UEDeployAndroid.cs
View File

@@ -909,6 +909,13 @@ namespace UnrealBuildTool
if (bAppendPlatformToVersionDisplayName)
{
VersionDisplayName = string.Format("{0}-Android", VersionDisplayName);
// add optional value from environment variable if defined
string OptionalAppendDisplayName = Environment.GetEnvironmentVariable("UEAndroidDisplayNameExtra");
if (OptionalAppendDisplayName != null)
{
VersionDisplayName = VersionDisplayName + OptionalAppendDisplayName;
}
}
}
@@ -4304,6 +4311,7 @@ namespace UnrealBuildTool
{ "//$${gameActivityClassAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityClassAdditions", "")},
{ "//$${gameActivityReadMetadataAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityReadMetadataAdditions", "")},
{ "//$${gameActivityOnCreateAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityOnCreateAdditions", "")},
{ "//$${gameActivityOnCreateFinalAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityOnCreateFinalAdditions", "")},
{ "//$${gameActivityOnDestroyAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityOnDestroyAdditions", "")},
{ "//$${gameActivityOnStartAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityOnStartAdditions", "")},
{ "//$${gameActivityOnStopAdditions}$$", UPL.ProcessPluginNode(NDKArch, "gameActivityOnStopAdditions", "")},