ff

dellis1972 · dellis1972 · commit ec01b0abe7d5 · 2021-06-02T11:55:23.000+01:00
diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/Aot.cs b/src/Xamarin.Android.Build.Tasks/Tasks/Aot.cs
@@ -366,13 +366,13 @@ IEnumerable<Config> GetAotConfigs ()
 
 					var libs = new List<string>();
 					if (NdkUtil.UsingClangNDK) {
-						libs.Add ($"-L\\\"{toolchainLibDir}\\\"");
-						libs.Add ($"-L\\\"{androidLibPath}\\\"");
+						libs.Add ($"-L\\\"{toolchainLibDir.TrimEnd ('\\')}\\\"");
+						libs.Add ($"-L\\\"{androidLibPath.TrimEnd ('\\')}\\\"");
 
 						if (arch == AndroidTargetArch.Arm) {
 							// Needed for -lunwind to work
 							string compilerLibDir = Path.Combine (toolchainPath, "..", "sysroot", "usr", "lib", NdkUtil.GetArchDirName (arch));
-							libs.Add ($"-L\\\"{compilerLibDir}\\\"");
+							libs.Add ($"-L\\\"{compilerLibDir.TrimEnd ('\\')}\\\"");
 						}
 					}
 

Original file line number	Diff line number	Diff line change
`@@ -366,13 +366,13 @@ IEnumerable<Config> GetAotConfigs ()`
`366`	`366`
`367`	`367`	`var libs = new List<string>();`
`368`	`368`	`if (NdkUtil.UsingClangNDK) {`
`369`		`- libs.Add ($"-L\\\"{toolchainLibDir}\\\"");`
`370`		`- libs.Add ($"-L\\\"{androidLibPath}\\\"");`
	`369`	`+ libs.Add ($"-L\\\"{toolchainLibDir.TrimEnd ('\\')}\\\"");`
	`370`	`+ libs.Add ($"-L\\\"{androidLibPath.TrimEnd ('\\')}\\\"");`
`371`	`371`
`372`	`372`	`if (arch == AndroidTargetArch.Arm) {`
`373`	`373`	`// Needed for -lunwind to work`
`374`	`374`	`string compilerLibDir = Path.Combine (toolchainPath, "..", "sysroot", "usr", "lib", NdkUtil.GetArchDirName (arch));`
`375`		`- libs.Add ($"-L\\\"{compilerLibDir}\\\"");`
	`375`	`+ libs.Add ($"-L\\\"{compilerLibDir.TrimEnd ('\\')}\\\"");`
`376`	`376`	`}`
`377`	`377`	`}`
`378`	`378`