Skip to content

Commit a197ed0

Browse files
Use .jar files from the .NET runtime pack (#7665)
Since dotnet/runtime#77386 has been merged, .NET will require a certain class from `libSystem.Security.Cryptography.Native.Android.jar` that will be located in the runtime pack files. I'm not sure if this is the best way to pull the .jar from the runtimepack so feedback is welcome. * Collect jar files from the runtime pack * Remove invalid dependency
1 parent c06ab6e commit a197ed0

File tree

1 file changed

+7
-0
lines changed

1 file changed

+7
-0
lines changed

src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets

+7
Original file line numberDiff line numberDiff line change
@@ -1388,6 +1388,12 @@ because xbuild doesn't support framework reference assemblies.
13881388
<MakeDir Directories="$(MonoAndroidIntermediateAssemblyDir)" Condition=" !Exists ('$(MonoAndroidIntermediateAssemblyDir)') " />
13891389
</Target>
13901390

1391+
<Target Name="_CollectRuntimePackJarFiles">
1392+
<ItemGroup>
1393+
<AndroidJavaLibrary Include="@(ResolvedFileToPublish)" Condition=" '%(ResolvedFileToPublish.Extension)' == '.jar' " />
1394+
</ItemGroup>
1395+
</Target>
1396+
13911397
<Target Name="_CollectRuntimeJarFilenames">
13921398
<PropertyGroup>
13931399
<_RuntimeJar Condition=" '$(UsingAndroidNETSdk)' != 'True' ">$(MSBuildThisFileDirectory)\java_runtime.jar</_RuntimeJar>
@@ -1909,6 +1915,7 @@ because xbuild doesn't support framework reference assemblies.
19091915

19101916
<PropertyGroup>
19111917
<_CompileJavaDependsOnTargets>
1918+
_CollectRuntimePackJarFiles;
19121919
_AdjustJavacVersionArguments;
19131920
_GeneratePackageManagerJava;
19141921
_FindJavaStubFiles;

0 commit comments

Comments
 (0)