Skip to content

Commit dc05de1

Browse files
dellis1972jonpryor
authored andcommitted
[Xamarin.Android.Build.Tests] Fix BindingCustomJavaApplicationClass (#890)
Fix up the builder to return a new property `AndroidMSBuildDirectory` which returns the correct directory to look for msbuild related files.
1 parent 6d233bb commit dc05de1

File tree

2 files changed

+7
-1
lines changed

2 files changed

+7
-1
lines changed

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BindingBuildTest.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -230,7 +230,7 @@ public void BindingCustomJavaApplicationClass ()
230230
binding.AndroidClassParser = "class-parse";
231231

232232
using (var bindingBuilder = CreateDllBuilder ("temp/BindingCustomJavaApplicationClass/MultiDexBinding")) {
233-
string multidexJar = Path.Combine (bindingBuilder.FrameworkLibDirectory, "android-support-multidex.jar");
233+
string multidexJar = Path.Combine (bindingBuilder.AndroidMSBuildDirectory, "android-support-multidex.jar");
234234
binding.Jars.Add (new AndroidItem.EmbeddedJar (() => multidexJar));
235235
bindingBuilder.Build (binding);
236236
var proj = new XamarinAndroidApplicationProject ();

src/Xamarin.Android.Build.Tasks/Tests/Xamarin.ProjectTools/Common/Builder.cs

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,12 @@ public string MSBuildExe {
8989
}
9090
}
9191

92+
public string AndroidMSBuildDirectory {
93+
get {
94+
return IsUnix ? Path.Combine (FrameworkLibDirectory, "xbuild", "Xamarin", "Android") : FrameworkLibDirectory;
95+
}
96+
}
97+
9298
public string FrameworkLibDirectory {
9399
get {
94100
if (IsUnix) {

0 commit comments

Comments
 (0)