From 432517278d0238f443f0d251595448cd0277e953 Mon Sep 17 00:00:00 2001 From: Dean Ellis Date: Fri, 22 Sep 2017 14:59:29 +0100 Subject: [PATCH] [Xamarin.Android.Build.Tests] Fix the BindingCustomJavaApplicationClass Test Fix up the builder to return a new property `AndroidMSBuildDirectory` which returns the correct directory to look for msbuild related files. a subdirectory of `lib/xamarin.android` on windows they are in a completely different location. --- .../Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs | 2 +- .../Tests/Xamarin.ProjectTools/Common/Builder.cs | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs index 4aedaab3957..f72ddb35a40 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs @@ -230,7 +230,7 @@ public void BindingCustomJavaApplicationClass () binding.AndroidClassParser = "class-parse"; using (var bindingBuilder = CreateDllBuilder ("temp/BindingCustomJavaApplicationClass/MultiDexBinding")) { - string multidexJar = Path.Combine (bindingBuilder.FrameworkLibDirectory, "android-support-multidex.jar"); + string multidexJar = Path.Combine (bindingBuilder.AndroidMSBuildDirectory, "android-support-multidex.jar"); binding.Jars.Add (new AndroidItem.EmbeddedJar (() => multidexJar)); bindingBuilder.Build (binding); var proj = new XamarinAndroidApplicationProject (); diff --git a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs index 8f3179cf23e..1ec86a7e4df 100644 --- a/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs +++ b/src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs @@ -89,6 +89,12 @@ public string MSBuildExe { } } + public string AndroidMSBuildDirectory { + get { + return IsUnix ? Path.Combine (FrameworkLibDirectory, "xbuild", "Xamarin", "Android") : FrameworkLibDirectory; + } + } + public string FrameworkLibDirectory { get { if (IsUnix) {