Fixed deploy error for launch on for android.

[CL 2102447 by Daniel Lamb in Main branch]
This commit is contained in:
Daniel Lamb
2014-06-11 18:10:21 -04:00
committed by UnrealBot
parent ad9c0bffb0
commit 9985ad1c1c

View File

@@ -280,7 +280,7 @@ public class AndroidPlatform : Platform
// copy files to device if we were staging
if (SC.Stage && !Params.SkipStage)
if (SC.Stage)
{
// cache some strings
string BaseCommandline = AdbCommand + "push";
@@ -317,23 +317,23 @@ public class AndroidPlatform : Platform
// delete the .obb file, since it will cause nothing we just deployed to be used
Run(CmdEnv.CmdExe, AdbCommand + "shell rm " + DeviceObbName);
}
else
{
// cache some strings
string BaseCommandline = AdbCommand + "push";
string RemoteDir = "/mnt/sdcard/" + Params.ShortProjectName;
else
{
// cache some strings
string BaseCommandline = AdbCommand + "push";
string RemoteDir = "/mnt/sdcard/" + Params.ShortProjectName;
string FinalRemoteDir = RemoteDir;
/* // handle the special case of the UE4Commandline.txt when using content only game (UE4Game)
if (!Params.IsCodeBasedProject)
{
FinalRemoteDir = "/mnt/sdcard/UE4Game";
}*/
string FinalRemoteDir = RemoteDir;
/* // handle the special case of the UE4Commandline.txt when using content only game (UE4Game)
if (!Params.IsCodeBasedProject)
{
FinalRemoteDir = "/mnt/sdcard/UE4Game";
}*/
string RemoteFilename = IntermediateCmdLineFile.Replace(SC.StageDirectory, FinalRemoteDir).Replace("\\", "/");
string Commandline = string.Format("{0} \"{1}\" \"{2}\"", BaseCommandline, IntermediateCmdLineFile, RemoteFilename);
Run(CmdEnv.CmdExe, Commandline);
}
string RemoteFilename = IntermediateCmdLineFile.Replace(SC.StageDirectory, FinalRemoteDir).Replace("\\", "/");
string Commandline = string.Format("{0} \"{1}\" \"{2}\"", BaseCommandline, IntermediateCmdLineFile, RemoteFilename);
Run(CmdEnv.CmdExe, Commandline);
}
}
/** Internal usage for GetPackageName */