You've already forked UnrealEngineUWP
mirror of
https://github.com/izzy2lost/UnrealEngineUWP.git
synced 2026-03-26 18:15:20 -07:00
#lockdown Nick.Penwarden #rb none ===================================== MAJOR FEATURES + CHANGES ===================================== Change 3385029 on 2017/04/07 by Chris.Babcock Remove unneeded BILLING permission for Android (it is added by enabling IAP) #jira UE-43583 #ue4 #android Change 3388541 on 2017/04/11 by Will.Fissler Removed "MacNoEditor" and "WindowsNoEditor" as target platforms in the StrategyTV.uproject. Change 3390026 on 2017/04/12 by Allan.Bentham Allow vertex texture reads on ES3.1 feature level #jira UE-43774 Change 3408788 on 2017/04/25 by Dmitriy.Dyomin Fixed: -iterativedeploy UAT option Change 3418253 on 2017/05/02 by Allan.Bentham Enable ICF linker option in android tool chain. #jira UEMOB-167 Change 3426789 on 2017/05/05 by Jonathan.Fitzpatrick #jira UE-43518 Fixed a missing cast to the proper game mode Change 3427859 on 2017/05/08 by Dmitriy.Dyomin Avoid creating unnecessary FUniqueObjectGuid in foliage (prevents package dirty on actor deletion) Change 3428842 on 2017/05/08 by Chris.Babcock Fix environment variable leakage in ant.bat patch (already in 4.16, didn't make the integration/merge) Fix Intermediate/Android/APK/src cleanup (already in 4.16, didn't make the integration/merge) #ue4 #android Change 3432096 on 2017/05/09 by Dmitriy.Dyomin Android LaunchOn improvements Change 3433937 on 2017/05/10 by Chris.Babcock Enable XGE on non-build machine #ue4 #android Change 3434556 on 2017/05/11 by Dmitriy.Dyomin Added mobile separate translucency #jira UEMOB-146 Change 3436664 on 2017/05/12 by Dmitriy.Dyomin Fixed: missing translucent objects on mobile, fallout from separate translucency Change 3437328 on 2017/05/12 by Allan.Bentham Add android versions of PRAGMA_DISABLE_OPTIMIZATION_ACTUAL and PRAGMA_ENABLE_OPTIMIZATION_ACTUAL Change 3446874 on 2017/05/18 by Chris.Babcock Change FGenericPlatformMemoryConstants and FGenericPlatformMemoryStats to use uint64 instead of SIZE_T to handle >4GB Android devices running in ARMv7 mode #jira #ue4 #android Change 3448354 on 2017/05/19 by Dmitriy.Dyomin Added: Support sRGB texture sampling on Android ES 3.1 and Vulkan #jira UEMOB-190 Change 3451129 on 2017/05/21 by Dmitriy.Dyomin Added project option to limit gpu skinning to 2 bone per vertex (Rendering Settings -> Optimizations -> Limit GPU skinning to 2 bones influence) #jira UEMOB-154 Change 3451131 on 2017/05/21 by Dmitriy.Dyomin Fixed: NavMesh streaming - stable tile addressing Change 3451141 on 2017/05/21 by Dmitriy.Dyomin Avoid drawing quads for clears on mobile Change 3453549 on 2017/05/23 by Dmitriy.Dyomin Fixed wrong memreport for STAT_TextureMemoryCube, STAT_PrecomputedLightVolumeMemory, STAT_ReflectionCaptureMemory Change 3458488 on 2017/05/25 by Dmitriy.Dyomin Added RenderDoc integration for Android Change 3458589 on 2017/05/25 by Dmitriy.Dyomin Fixed foliage occlusion culling after world origin was rebased Change 3462146 on 2017/05/26 by Nick.Shin HTML5 - merge from Release-4.16 to Dev-Mobile #jira none #rnx Change3462166on 2017/05/26 by Nick.Shin HTML5 - fix viewport after returning from fullscreen PR:113b9ea104#jira UE-44419 HTML5 - View does not redraw properly after returning from Fullscreen #rn fix viewport after returning from fullscreen Change 3464093 on 2017/05/28 by Jack.Porter Fix for GenerateProjectFiles warnings #codereview: Nick.Shin Change 3465335 on 2017/05/30 by Nick.Shin HTML5LaunchHelper.exe - current working directory "/" check #jira UE-45302 HTML5LaunchHelper.exe hosts the files in the current working directory on Linux #rnx Change 3465499 on 2017/05/30 by Nick.Shin HTML5 - TaskGraph crash fix & compiler fix when STATS disabled #jira UE-44811 Projects crash when launching onto Firefox 64-bit #rnx Change 3468295 on 2017/05/31 by Chris.Babcock Allow mediaplayer audio to be disable on Android #jira UE-45570 #ue4 #android Change 3469099 on 2017/06/01 by Dmitriy.Dyomin Fixing mobile separate translucency after merge Change 3470541 on 2017/06/01 by Chris.Babcock Fix Android.NewKeyboard behavior #jira UE-45612 #ue4 #android Change 3470576 on 2017/06/01 by Chris.Babcock Blacklist DefaultBloomKernel on mobile platforms (unneeded and takes 32MB) #jira UE-45548 #ue4 #android Change 3471583 on 2017/06/02 by Allan.Bentham #jira UEMOB-361 Add experimental mobile PIE with device preview launch option. Change 3471708 on 2017/06/02 by Allan.Bentham Fixes for no unity no pch CIS build. Add missing #includes Change 3474619 on 2017/06/05 by Chris.Babcock Add support for optional Gradle build system #jira UEMOB-229 #ue4 #android Change 3477357 on 2017/06/07 by Dmitriy.Dyomin Added GLES for RenderDoc capture on Android #contributed by Jimmy Lee (https://github.com/Oculus-VR/UnrealEngine/pull/7) Change 3477953 on 2017/06/07 by Nick.Shin HTML5 memory/executable size pass these fixes contains: + build shipping asmjs compressed files (remove serving non-compressed data file) + phsyx updated emscripten toolchain cmake config override (i.e. removed EPIC_BUILD_FLAGS match) + retired "/Script/BuildSettings.BuildSettings" config code + added better verbose feedback to print optimization levels during packaging #jira UEMOB-382 HTML5 memory/executable size pass #rn a lot of stability fixes Change 3479142 on 2017/06/07 by Chris.Babcock Update Clang version checks and handle 3.9 #jira UE-45812 #ue4 #android Change 3479416 on 2017/06/08 by Dmitriy.Dyomin Fixed UBT crash introduced in CL# 3477357 Change 3479425 on 2017/06/08 by Dmitriy.Dyomin Fixed: CustomDepth sampling outside of PP materials on Mobile #jira UE-44700 Change 3479600 on 2017/06/08 by Dmitriy.Dyomin Do "-skipdeploy" when packaging Change 3481938 on 2017/06/09 by Dmitriy.Dyomin Fixed: LG G6, Samsung Galaxy S8 Letter box issue #jira UE-45164 Change 3482725 on 2017/06/09 by Chris.Babcock Fix out of bounds access to iChild #jira none Change 3482735 on 2017/06/09 by Chris.Babcock Support for NDK14b and start of NDK15 support (Clang 5.0) #jira UEMOB-240 #ue4 #android Change 3484209 on 2017/06/11 by Dmitriy.Dyomin fixed warning introduced in CL# 3481938 Change 3484256 on 2017/06/11 by Dmitriy.Dyomin Fixed: HighresShot with 'Use Customdepth as mask' in Feature level ES2 (Android preview rendering level) leads to Engine crash #jira UE-43655 also requires content changes in CL# 3484255 Change 3484295 on 2017/06/12 by Dmitriy.Dyomin Fixed: Deferred Decals move with the camera in HTML5 #jira UE-45606 Change 3484748 on 2017/06/12 by Chris.Babcock Add detection of Houdini (running on Intel Android CPU emulating ARM) #jira UE-45934 #ue4 #android Change 3484766 on 2017/06/12 by Chris.Babcock Add missing log message for UsingHoudini #jira UE-45934 #ue4 #android Change 3485762 on 2017/06/12 by Chris.Babcock Check in Gradle TPS #jira none #ue4 #android Change 3486596 on 2017/06/13 by Jack.Porter Fixed merge error Change 3487559 on 2017/06/13 by Peter.Sauerbrei disable bEnableREmoteNotifications in binary builds #jira UE-44156 Change 3487875 on 2017/06/13 by Peter.Sauerbrei make it so we don't crash if the device isn't paired #jira UE-38247 Change 3487949 on 2017/06/13 by Peter.Sauerbrei fix for casing of DotNET in several locations from PR#3112 (portaloffreedom and Madh93) #jira UE-40396 Change 3488155 on 2017/06/13 by Peter.Sauerbrei fix for intermediate being lower cased when we want mixed case, keeps commandline txt file lower cased (original PR#2939 from kosz78, modified from that change) #jira UE-38737 Change 3488428 on 2017/06/13 by Chris.Babcock Fix permissions on gradlew on Mac and Linux #jira UE-46002 #ue4 #android Change 3488735 on 2017/06/13 by Dmitriy.Dyomin Removed MDG note about crash on none-mali devices Change 3488961 on 2017/06/14 by Dmitriy.Dyomin Fixed: scene capture component was applying only default ShowFlags in game Change 3489162 on 2017/06/14 by Jack.Porter Removed checkbox "Deferred Rendering with Metal" on iOS. This feature is no longer supported and will be replaced by a Metal 2-based renderer. #jira UE-41766 Change 3489192 on 2017/06/14 by Peter.Sauerbrei hide 32-bit and OpenGL options for IOS #jira none Change 3489207 on 2017/06/14 by Peter.Sauerbrei make the MetalMRT setting hidden instead of removed Change 3489593 on 2017/06/14 by Jack.Porter Removed the Android_All cook flavor as it's deprecated in favor of Android_Multi #jira UE-45469 Change 3491385 on 2017/06/15 by Dmitriy.Dyomin Fixed: SM_FireFX Particle not rendering for various Android texture compressions #jira UE-46083 Change 3491402 on 2017/06/15 by Dmitriy.Dyomin Fixed: Static + CSM shadows cause a crash #jira UE-46091 Change 3493586 on 2017/06/15 by Chris.Babcock Remove extra > in AndroidManifest #jira UE-46134 #ue4 #android Change 3496193 on 2017/06/16 by Chris.Babcock Fix DeviceProfileManager setting in WEX #jira UE-46176 #ue4 #android [CL 3496903 by Peter Sauerbrei in Main branch]
209 lines
5.2 KiB
C++
209 lines
5.2 KiB
C++
// Copyright 1998-2017 Epic Games, Inc. All Rights Reserved.
|
|
|
|
/* ITargetDevice interface
|
|
*****************************************************************************/
|
|
#include "CoreTypes.h"
|
|
#include "Containers/UnrealString.h"
|
|
#include "Misc/Optional.h"
|
|
#include "HAL/PlatformProcess.h"
|
|
#include "AndroidTargetDeviceOutput.h"
|
|
|
|
class FAndroidTargetDevice;
|
|
struct FTargetDeviceProcessInfo;
|
|
enum class ETargetDeviceFeatures;
|
|
|
|
template<typename OptionalType> struct TOptional;
|
|
|
|
inline bool FAndroidTargetDevice::Deploy( const FString& SourceFolder, FString& OutAppId )
|
|
{
|
|
int32 ReturnCode = 0;
|
|
//void* RunningProc = NULL;
|
|
|
|
// run the packager to create and install the .apk
|
|
// @todo android: install separately?
|
|
FString RepackageCommand(FString(TEXT("AndroidPackager ")) + OutAppId + FString(TEXT(" AndroidARMv7 ")) + FString(TEXT("Debug")));
|
|
FProcHandle RunningProc = FPlatformProcess::CreateProc(TEXT("../DotNET/Android/AndroidPackager"), *RepackageCommand, true, false, false, NULL, 0, TEXT("../DotNET/"), NULL);
|
|
FPlatformProcess::WaitForProc(RunningProc);
|
|
FPlatformProcess::GetProcReturnCode(RunningProc, &ReturnCode);
|
|
FPlatformProcess::CloseProc(RunningProc);
|
|
|
|
return 0 == ReturnCode;
|
|
}
|
|
|
|
inline FString FAndroidTargetDevice::GetOperatingSystemName()
|
|
{
|
|
if (!AndroidVersionString.IsEmpty())
|
|
{
|
|
return FString::Printf(TEXT("Android %s, API level %d"), *AndroidVersionString, AndroidSDKVersion);
|
|
}
|
|
else
|
|
{
|
|
return TEXT("Android");
|
|
}
|
|
}
|
|
|
|
inline int32 FAndroidTargetDevice::GetProcessSnapshot( TArray<FTargetDeviceProcessInfo>& OutProcessInfos )
|
|
{
|
|
return 0;
|
|
}
|
|
|
|
|
|
inline bool FAndroidTargetDevice::Launch( const FString& AppId, EBuildConfigurations::Type BuildConfiguration, EBuildTargets::Type BuildTarget, const FString& Params, uint32* OutProcessId )
|
|
{
|
|
// this isn't used, UAT handles it all
|
|
return false;
|
|
}
|
|
|
|
|
|
inline bool FAndroidTargetDevice::Reboot( bool bReconnect )
|
|
{
|
|
if (!ExecuteAdbCommand(TEXT("reboot"), NULL, NULL))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
inline bool FAndroidTargetDevice::PowerOff( bool Force )
|
|
{
|
|
if (!ExecuteAdbCommand(TEXT("reboot --poweroff"), NULL, NULL))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|
|
|
|
|
|
inline bool FAndroidTargetDevice::Run( const FString& ExecutablePath, const FString& Params, uint32* OutProcessId )
|
|
{
|
|
// @todo android: how to run from this?
|
|
return false;
|
|
}
|
|
|
|
|
|
inline bool FAndroidTargetDevice::SupportsFeature( ETargetDeviceFeatures Feature ) const
|
|
{
|
|
switch (Feature)
|
|
{
|
|
case ETargetDeviceFeatures::PowerOff:
|
|
return true;
|
|
|
|
case ETargetDeviceFeatures::PowerOn:
|
|
return false;
|
|
|
|
case ETargetDeviceFeatures::Reboot:
|
|
return true;
|
|
|
|
default:
|
|
return false;
|
|
}
|
|
}
|
|
|
|
|
|
inline bool FAndroidTargetDevice::SupportsSdkVersion( const FString& VersionString ) const
|
|
{
|
|
return true;
|
|
}
|
|
|
|
|
|
inline bool FAndroidTargetDevice::TerminateProcess( const int64 ProcessId )
|
|
{
|
|
return false;
|
|
}
|
|
|
|
|
|
inline void FAndroidTargetDevice::SetUserCredentials( const FString& UserName, const FString& UserPassword )
|
|
{
|
|
}
|
|
|
|
|
|
inline bool FAndroidTargetDevice::GetUserCredentials( FString& OutUserName, FString& OutUserPassword )
|
|
{
|
|
return false;
|
|
}
|
|
|
|
inline void FAndroidTargetDevice::ExecuteConsoleCommand(const FString& ExecCommand) const
|
|
{
|
|
FString AdbCommand = FString::Printf(TEXT("shell \"am broadcast -a android.intent.action.RUN -e cmd '%s'\""), *ExecCommand);
|
|
ExecuteAdbCommand(AdbCommand, nullptr, nullptr);
|
|
}
|
|
|
|
inline ITargetDeviceOutputPtr FAndroidTargetDevice::CreateDeviceOutputRouter(FOutputDevice* Output) const
|
|
{
|
|
FAndroidTargetDeviceOutputPtr DeviceOutputPtr = MakeShareable(new FAndroidTargetDeviceOutput());
|
|
if (DeviceOutputPtr->Init(*this, Output))
|
|
{
|
|
return DeviceOutputPtr;
|
|
}
|
|
|
|
return nullptr;
|
|
}
|
|
|
|
/* FAndroidTargetDevice implementation
|
|
*****************************************************************************/
|
|
|
|
inline bool FAndroidTargetDevice::GetAdbFullFilename(FString& OutFilename)
|
|
{
|
|
TOptional<FString> ResultPath;
|
|
|
|
// get the SDK binaries folder
|
|
TCHAR AndroidDirectory[32768] = { 0 };
|
|
|
|
FPlatformMisc::GetEnvironmentVariable(TEXT("ANDROID_HOME"), AndroidDirectory, 32768);
|
|
if (AndroidDirectory[0] == 0)
|
|
{
|
|
return false;
|
|
}
|
|
|
|
#if PLATFORM_WINDOWS
|
|
OutFilename = FString::Printf(TEXT("%s\\platform-tools\\adb.exe"), AndroidDirectory);
|
|
#else
|
|
OutFilename = FString::Printf(TEXT("%s/platform-tools/adb"), AndroidDirectory);
|
|
#endif
|
|
|
|
return true;
|
|
}
|
|
|
|
inline bool FAndroidTargetDevice::ExecuteAdbCommand( const FString& CommandLine, FString* OutStdOut, FString* OutStdErr ) const
|
|
{
|
|
FString Filename;
|
|
if (!GetAdbFullFilename(Filename))
|
|
{
|
|
return false;
|
|
}
|
|
|
|
// execute the command
|
|
int32 ReturnCode;
|
|
FString DefaultError;
|
|
|
|
// make sure there's a place for error output to go if the caller specified NULL
|
|
if (!OutStdErr)
|
|
{
|
|
OutStdErr = &DefaultError;
|
|
}
|
|
|
|
FString CommandLineWithDevice;
|
|
// the devices command should never include a specific device
|
|
if (CommandLine == TEXT("devices"))
|
|
{
|
|
CommandLineWithDevice = CommandLine;
|
|
}
|
|
else
|
|
{
|
|
CommandLineWithDevice = FString::Printf(TEXT("-s %s %s"), *SerialNumber, *CommandLine);
|
|
}
|
|
|
|
FPlatformProcess::ExecProcess(*Filename, *CommandLineWithDevice, &ReturnCode, OutStdOut, OutStdErr);
|
|
|
|
if (ReturnCode != 0)
|
|
{
|
|
FPlatformMisc::LowLevelOutputDebugStringf(TEXT("The Android SDK command '%s' failed to run. Return code: %d, Error: %s\n"), *CommandLineWithDevice, ReturnCode, **OutStdErr);
|
|
|
|
return false;
|
|
}
|
|
|
|
return true;
|
|
}
|