Skip to content

Commit 4e13b9e

Browse files
author
Dogancan Ozturk
committed
targets are updated to include native dependencies on android builds.
1 parent a7bc1e2 commit 4e13b9e

File tree

2 files changed

+10
-49
lines changed

2 files changed

+10
-49
lines changed

H264Sharp/H264Sharp.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<AllowUnsafeBlocks>True</AllowUnsafeBlocks>
66
<GeneratePackageOnBuild>True</GeneratePackageOnBuild>
77
<Title>H264Sharp</Title>
8-
<Version>1.9.6</Version>
8+
<Version>1.9.9</Version>
99
<PackageProjectUrl>https://github.com/ReferenceType/H264Sharp</PackageProjectUrl>
1010
<Authors>ReferenceType</Authors>
1111
<RepositoryUrl>https://github.com/ReferenceType/H264Sharp</RepositoryUrl>

H264Sharp/build/H264Sharp.targets

Lines changed: 9 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -27,66 +27,27 @@
2727
</ItemGroup>
2828

2929
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::Linux)))' == 'true'">
30-
<!-- Linux specific -->
30+
<!-- Linux -->
3131
<None Include="$(MSBuildThisFileDirectory)..\runtimes\linux-x64\**\*.*"
3232
Link="%(Filename)%(Extension)"
3333
CopyToOutputDirectory="PreserveNewest"
3434
Visible="false" />
3535
</ItemGroup>
3636

3737
<ItemGroup Condition="'$(RuntimeIdentifier)' == '' AND '$([System.Runtime.InteropServices.RuntimeInformation]::IsOSPlatform($([System.Runtime.InteropServices.OSPlatform]::OSX)))' == 'true'">
38-
<!-- macOS specific -->
38+
<!-- macOS -->
3939
<None Include="$(MSBuildThisFileDirectory)..\runtimes\osx-x64\**\*.*"
4040
Link="%(Filename)%(Extension)"
4141
CopyToOutputDirectory="PreserveNewest"
4242
Visible="false" />
4343
</ItemGroup>
4444

45-
<!-- For Xamarin.Android projects -->
46-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid'">
47-
<!-- Android arm64-v8a (64-bit ARM) -->
48-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-arm64\**\*.*"
49-
Link="libs\arm64-v8a\%(Filename)%(Extension)"
50-
CopyToOutputDirectory="PreserveNewest"
51-
Visible="false" />
52-
<!-- Android armeabi-v7a (32-bit ARM) -->
53-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-arm\**\*.*"
54-
Link="libs\armeabi-v7a\%(Filename)%(Extension)"
55-
CopyToOutputDirectory="PreserveNewest"
56-
Visible="false" />
57-
<!-- Android x86 (32-bit x86) -->
58-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-x86\**\*.*"
59-
Link="libs\x86\%(Filename)%(Extension)"
60-
CopyToOutputDirectory="PreserveNewest"
61-
Visible="false" />
62-
<!-- Android x86_64 (64-bit x86) -->
63-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-x64\**\*.*"
64-
Link="libs\x86_64\%(Filename)%(Extension)"
65-
CopyToOutputDirectory="PreserveNewest"
66-
Visible="false" />
67-
</ItemGroup>
6845

69-
<!-- For .NET MAUI / modern .NET Android projects -->
70-
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'net' AND '$(TargetPlatformIdentifier)' == 'android'">
71-
<!-- Android arm64-v8a (64-bit ARM) -->
72-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-arm64\**\*.*"
73-
Link="Platforms\Android\jniLibs\arm64-v8a\%(Filename)%(Extension)"
74-
CopyToOutputDirectory="PreserveNewest"
75-
Visible="true" />
76-
<!-- Android armeabi-v7a (32-bit ARM) -->
77-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-arm\**\*.*"
78-
Link="Platforms\Android\jniLibs\armeabi-v7a\%(Filename)%(Extension)"
79-
CopyToOutputDirectory="PreserveNewest"
80-
Visible="true" />
81-
<!-- Android x86 (32-bit x86) -->
82-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-x86\**\*.*"
83-
Link="Platforms\Android\jniLibs\x86\%(Filename)%(Extension)"
84-
CopyToOutputDirectory="PreserveNewest"
85-
Visible="true" />
86-
<!-- Android x86_64 (64-bit x86) -->
87-
<None Include="$(MSBuildThisFileDirectory)..\runtimes\android-x64\**\*.*"
88-
Link="Platforms\Android\jniLibs\x86_64\%(Filename)%(Extension)"
89-
CopyToOutputDirectory="PreserveNewest"
90-
Visible="true" />
91-
</ItemGroup>
46+
<ItemGroup Condition="'$(TargetFrameworkIdentifier)' == 'MonoAndroid' OR '$(TargetPlatformIdentifier)' == 'android'">
47+
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)../runtimes/android-arm/**/*.*" />
48+
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)../runtimes/android-arm64/**/*.*" />
49+
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)../runtimes/android-x86/**/*.*" />
50+
<AndroidNativeLibrary Include="$(MSBuildThisFileDirectory)../runtimes/android-x64/**/*.*" />
51+
</ItemGroup>
52+
9253
</Project>

0 commit comments

Comments
 (0)