Skip to content
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

Use .jar files from the .NET runtime pack #7665

Merged
merged 2 commits into from
Jan 26, 2023
Merged

Use .jar files from the .NET runtime pack #7665

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bc5e9dc
Collect jar files from the runtime pack
simonrozsival Dec 6, 2022
b857367
Remove invalid dependency
simonrozsival Jan 9, 2023
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
7 changes: 7 additions & 0 deletions 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 @@ -1341,6 +1341,12 @@ because xbuild doesn't support framework reference assemblies.
<MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)" Condition=" !Exists ('$(MonoAndroidIntermediateAssemblyDir)') " />
</Target>

<Target Name="_CollectRuntimePackJarFiles">
<ItemGroup>
<AndroidJavaLibrary Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.jar' " />
Copy link
Member

@jonathanpeppers jonathanpeppers Jan 9, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is the .jar file in all 4 runtime packs? android-arm, android-arm64, android-x86, android-x64?

We'll probably have to deduplicate them somehow. Let's wait to look into this, when the changes in dotnet/runtime flow to us.

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, each runtimepack should have a copy of the jar file.

</ItemGroup>
</Target>

<Target Name="_CollectRuntimeJarFilenames">
<PropertyGroup>
<_RuntimeJar Condition=" '$(UsingAndroidNETSdk)' != 'True' ">$(MSBuildThisFileDirectory)\java_runtime.jar</_RuntimeJar>
Expand Down Expand Up @@ -1861,6 +1867,7 @@ because xbuild doesn't support framework reference assemblies.

<PropertyGroup>
<_CompileJavaDependsOnTargets>
_CollectRuntimePackJarFiles;
_AdjustJavacVersionArguments;
_GeneratePackageManagerJava;
_FindJavaStubFiles;
Expand Down