Skip to content

[Xamarin.Android.Build.Tasks] _AddMultiDexDependencyJars only runs for apps #5548

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
jonathanpeppers merged 1 commit into from
Jan 27, 2021
+23 −1
Merged

[Xamarin.Android.Build.Tasks] _AddMultiDexDependencyJars only runs for apps #5548

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 21 additions & 0 deletions src/Xamarin.Android.Build.Tasks/Tests/Xamarin.Android.Build.Tests/BuildTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,9 +175,30 @@ public void ClassLibraryHasNoWarnings ()
//NOTE: these properties should not affect class libraries at all
proj.SetProperty ("AndroidPackageFormat", "aab");
proj.SetProperty ("AotAssemblies", "true");
proj.SetProperty ("AndroidEnableMultiDex", "true");
using (var b = CreateDllBuilder ()) {
Assert.IsTrue (b.Build (proj), "Build should have succeeded.");
Assert.IsTrue (StringAssertEx.ContainsText (b.LastBuildOutput, " 0 Warning(s)"), "Should have no MSBuild warnings.");

// $(AndroidEnableMultiDex) should not add android-support-multidex.jar!
if (Builder.UseDotNet) {
var aarPath = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, $"{proj.ProjectName}.aar");
using var zip = Xamarin.Tools.Zip.ZipArchive.Open (aarPath, FileMode.Open);
Assert.IsFalse (zip.Any (e => e.FullName.EndsWith (".jar", StringComparison.OrdinalIgnoreCase)),
$"{aarPath} should not contain a .jar file!");
} else {
var assemblyPath = Path.Combine (Root, b.ProjectDirectory, proj.OutputPath, $"{proj.ProjectName}.dll");
using var assembly = AssemblyDefinition.ReadAssembly (assemblyPath);
const string libraryProjects = "__AndroidLibraryProjects__.zip";
var resource = assembly.MainModule.Resources.OfType<EmbeddedResource> ()
.FirstOrDefault (e => e.Name == libraryProjects);
Assert.IsNotNull (resource, $"{assemblyPath} should contain {libraryProjects}");

using var stream = resource.GetResourceStream ();
using var zip = Xamarin.Tools.Zip.ZipArchive.Open (stream);
Assert.IsFalse (zip.Any (e => e.FullName.EndsWith (".jar", StringComparison.OrdinalIgnoreCase)),
$"{resource.Name} should not contain a .jar file!");
}
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1021,7 +1021,8 @@ because xbuild doesn't support framework reference assemblies.
</ItemGroup>
</Target>

<Target Name="_AddMultiDexDependencyJars">
<Target Name="_AddMultiDexDependencyJars"
Condition=" '$(AndroidApplication)' == 'true' ">
<ItemGroup Condition=" '$(AndroidEnableMultiDex)' == 'True' AND '$(AndroidMultiDexSupportJar)' != '' ">
<AndroidJavaLibrary Include="$(_AndroidSdkDirectory)\$(AndroidMultiDexSupportJar)" />
</ItemGroup>
Expand Down