From 56ec8044dc9460ce5eb5bccf4ef288567a902073 Mon Sep 17 00:00:00 2001 From: Atsushi Eno Date: Tue, 16 Aug 2016 17:39:35 +0900 Subject: [PATCH] [msbuild] bring back AndroidExternalJavaLibrary to Javac references. This shold fix https://bugzilla.xamarin.com/show_bug.cgi?id=42091 When we fixed #27553 we reorganized the entire Java library resolution step so that the build tasks could consistently resolve jars to package. Sadly AndroidExternalJavaLibrary dropped out from the Javac reference which should actually be different list than CompileToDalvik candidate. This brings back AndroidExternalJavaLibrary to "reference-only" list. --- .../Tasks/DetermineJavaLibrariesToCompile.cs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/Xamarin.Android.Build.Tasks/Tasks/DetermineJavaLibrariesToCompile.cs b/src/Xamarin.Android.Build.Tasks/Tasks/DetermineJavaLibrariesToCompile.cs index 36b88cf99c7..ed87c39eeff 100644 --- a/src/Xamarin.Android.Build.Tasks/Tasks/DetermineJavaLibrariesToCompile.cs +++ b/src/Xamarin.Android.Build.Tasks/Tasks/DetermineJavaLibrariesToCompile.cs @@ -65,7 +65,8 @@ public override bool Execute () jars = jars.Where (j => distinct.Contains (j)).ToList (); JavaLibrariesToCompile = jars.Where (j => !IsExcluded (j.ItemSpec)).ToArray (); - ReferenceJavaLibraries = jars.Except (JavaLibrariesToCompile).ToArray (); + ReferenceJavaLibraries = (ExternalJavaLibraries ?? Enumerable.Empty ()) + .Concat (jars.Except (JavaLibrariesToCompile)).ToArray (); Log.LogDebugTaskItems (" JavaLibrariesToCompile:", JavaLibrariesToCompile); Log.LogDebugTaskItems (" ReferenceJavaLibraries:", ReferenceJavaLibraries);