Merging //UE4/Dev-Main to Dev-Mobile (//UE4/Dev-Mobile)

#jira 0
#rb None

[CL 4161603 by Jack Porter in Dev-Mobile branch]
This commit is contained in:
Jack Porter
2018-06-26 08:42:47 -04:00
8166 changed files with 436245 additions and 217422 deletions

View File

@@ -50,6 +50,7 @@ public:
SinglePlatforms.Add(new FAndroid_ATCTargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_DXTTargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_ETC1TargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_ETC1aTargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_ETC2TargetPlatform(bIsClient));
SinglePlatforms.Add(new FAndroid_PVRTCTargetPlatform(bIsClient));