Rework pathing a bit

dellis1972 · dellis1972 · commit 1276ce341e9b · 2018-09-22T12:51:06.000+01:00
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Javac.cs
@@ -67,8 +67,8 @@ protected override string GenerateCommandLineCommands ()
 
 		protected override void WriteOptionsToResponseFile (StreamWriter sw)
 		{
-			WriteLineToStreamWriterAndLog (sw, $"-d \"{Files.GetShortPath(ClassesOutputDirectory).ToJavaEscapedPath ()}\"");
-			WriteLineToStreamWriterAndLog (sw, "-bootclasspath \"{0}\"", Files.GetShortPath(JavaPlatformJarPath).ToJavaEscapedPath ());
+			WriteLineToStreamWriterAndLog (sw, $"-d \"{ClassesOutputDirectory.ToJavaEscapedPath ()}\"");
+			WriteLineToStreamWriterAndLog (sw, "-bootclasspath {0}", Files.GetShortPath(JavaPlatformJarPath).ToJavaEscapedPath ());
 			WriteLineToStreamWriterAndLog (sw, "-classpath \"{0}\"", Jars == null || !Jars.Any () ? null : string.Join (Path.PathSeparator.ToString (), Jars.Select (i => i.ItemSpec.ToJavaEscapedPath ())));
 			WriteLineToStreamWriterAndLog (sw, $"-encoding UTF8");
 		}

Original file line number	Diff line number	Diff line change
`@@ -67,8 +67,8 @@ protected override string GenerateCommandLineCommands ()`
`67`	`67`
`68`	`68`	`protected override void WriteOptionsToResponseFile (StreamWriter sw)`
`69`	`69`	`{`
`70`		`- WriteLineToStreamWriterAndLog (sw, $"-d \"{Files.GetShortPath(ClassesOutputDirectory).ToJavaEscapedPath ()}\"");`
`71`		`- WriteLineToStreamWriterAndLog (sw, "-bootclasspath \"{0}\"", Files.GetShortPath(JavaPlatformJarPath).ToJavaEscapedPath ());`
	`70`	`+ WriteLineToStreamWriterAndLog (sw, $"-d \"{ClassesOutputDirectory.ToJavaEscapedPath ()}\"");`
	`71`	`+ WriteLineToStreamWriterAndLog (sw, "-bootclasspath {0}", Files.GetShortPath(JavaPlatformJarPath).ToJavaEscapedPath ());`
`72`	`72`	`WriteLineToStreamWriterAndLog (sw, "-classpath \"{0}\"", Jars == null \|\| !Jars.Any () ? null : string.Join (Path.PathSeparator.ToString (), Jars.Select (i => i.ItemSpec.ToJavaEscapedPath ())));`
`73`	`73`	`WriteLineToStreamWriterAndLog (sw, $"-encoding UTF8");`
`74`	`74`	`}`