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

Merging //UE4/Release-4.17 @ CL 3528061 to Release-Staging-4.17 (//UE4/Release-Staging-4.17)

Browse Source 
#rb none
#jira UE-123

[CL 3535468 by Ben Marsh in Staging-4.17 branch]
This commit is contained in:
Ben Marsh
2017-07-13 10:13:07 -04:00
parent 6fb8420906 5e5a419869
commit f86325bfa7
485 changed files with 11010 additions and 5472 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Engine/Source/Developer/Android/AndroidDeviceDetection/Private/AndroidDeviceDetectionModule.cpp
View File

@@ -397,13 +397,19 @@ public:
return &DeviceMapLock;
}
virtual FString GetADBPath() override
{
FScopeLock PathUpdateLock(&ADBPathCheckLock);
return ADBPath;
}
virtual void UpdateADBPath() override
{
FScopeLock PathUpdateLock(&ADBPathCheckLock);
TCHAR AndroidDirectory[32768] = { 0 };
FPlatformMisc::GetEnvironmentVariable(TEXT("ANDROID_HOME"), AndroidDirectory, 32768);
FString ADBPath;
ADBPath.Empty();
#if PLATFORM_MAC || PLATFORM_LINUX
if (AndroidDirectory[0] == 0)
@@ -462,6 +468,8 @@ public:
private:
// path to the adb command (local)
FString ADBPath;
FRunnableThread* DetectionThread;
FAndroidDeviceDetectionRunnable* DetectionThreadRunnable;