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.

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

Android arm #641

Open
wants to merge 11 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .github/workflows/IKVM.yml
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,7 @@ jobs:
if: runner.os == 'Linux'
uses: jlumbroso/free-disk-space@main
with:
android: false
swap-storage: false
- name: Checkout Source
uses: actions/checkout@v4
Expand Down
12 changes: 6 additions & 6 deletions Directory.Build.props
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
<Project>
<PropertyGroup Label="Runtime Info">
<SupportedRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedRuntimes>
<SupportedRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm;android-arm64</SupportedRuntimes>
<EnabledRuntimes Condition=" '$(EnabledRuntimes)' == '' ">$(SupportedRuntimes)</EnabledRuntimes>
<SupportedImageRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm;android-arm64</SupportedImageRuntimes>
<EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>
<SupportedToolRuntimes>win-x64;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedToolRuntimes>
<EnabledToolRuntimes Condition=" '$(EnabledToolRuntimes)' == '' ">$(SupportedToolRuntimes)</EnabledToolRuntimes>
<SupportedImageRuntimes>win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64</SupportedImageRuntimes>
<EnabledImageRuntimes Condition=" '$(EnabledImageRuntimes)' == '' ">$(SupportedImageRuntimes)</EnabledImageRuntimes>

<_SupportedRuntimes>;$(SupportedRuntimes);</_SupportedRuntimes>
<_EnabledRuntimes>;$(EnabledRuntimes);</_EnabledRuntimes>
<_SupportedToolRuntimes>;$(SupportedToolRuntimes);</_SupportedToolRuntimes>
<_EnabledToolRuntimes>;$(EnabledToolRuntimes);</_EnabledToolRuntimes>
<_SupportedImageRuntimes>;$(SupportedImageRuntimes);</_SupportedImageRuntimes>
<_EnabledImageRuntimes>;$(EnabledImageRuntimes);</_EnabledImageRuntimes>
<_SupportedToolRuntimes>;$(SupportedToolRuntimes);</_SupportedToolRuntimes>
<_EnabledToolRuntimes>;$(EnabledToolRuntimes);</_EnabledToolRuntimes>
</PropertyGroup>

<PropertyGroup Label="OpenJDK Info">
Expand Down Expand Up @@ -99,7 +99,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="IKVM.Core.MSBuild" Version="0.1.102">
<PackageReference Include="IKVM.Core.MSBuild" Version="0.1.103">
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
<PrivateAssets>all</PrivateAssets>
</PackageReference>
Expand Down
12 changes: 12 additions & 0 deletions IKVM.sln
Original file line number Diff line number Diff line change
Expand Up @@ -349,6 +349,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Benchmarks", "src\IKVM
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Benchmarks.Java", "src\IKVM.Benchmarks.Java\IKVM.Benchmarks.Java.csproj", "{9F5CDC85-BCD8-468E-9FC6-4DC9E3A576D0}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Image.runtime.android-arm64", "src\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj", "{843B0704-DA5E-4357-B683-3D6F64DEF57B}"
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "IKVM.Image.runtime.android-arm", "src\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj", "{72994D7F-A9A8-45F9-A74B-0718DD192943}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand Down Expand Up @@ -939,6 +943,14 @@ Global
{9F5CDC85-BCD8-468E-9FC6-4DC9E3A576D0}.Debug|Any CPU.Build.0 = Debug|Any CPU
{9F5CDC85-BCD8-468E-9FC6-4DC9E3A576D0}.Release|Any CPU.ActiveCfg = Release|Any CPU
{9F5CDC85-BCD8-468E-9FC6-4DC9E3A576D0}.Release|Any CPU.Build.0 = Release|Any CPU
{843B0704-DA5E-4357-B683-3D6F64DEF57B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{843B0704-DA5E-4357-B683-3D6F64DEF57B}.Debug|Any CPU.Build.0 = Debug|Any CPU
{843B0704-DA5E-4357-B683-3D6F64DEF57B}.Release|Any CPU.ActiveCfg = Release|Any CPU
{843B0704-DA5E-4357-B683-3D6F64DEF57B}.Release|Any CPU.Build.0 = Release|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Debug|Any CPU.Build.0 = Debug|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Release|Any CPU.ActiveCfg = Release|Any CPU
{72994D7F-A9A8-45F9-A74B-0718DD192943}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
2 changes: 1 addition & 1 deletion ext/openjdk
10 changes: 5 additions & 5 deletions src/IKVM.Image-bin/IKVM.Image-bin.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libunpack\libunpack.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libsunec\libsunec.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libsunmscapi\libsunmscapi.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libawt\libawt.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libawt\libawt.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;osx-x64;osx-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libmanagement\libmanagement.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libj2pkcs11\libj2pkcs11.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjaas\libjaas.clangproj" />
Expand All @@ -26,16 +26,16 @@
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libosx\libosx.clangproj" SupportedRuntimes="osx-x64;osx-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libosxui\libosxui.clangproj" SupportedRuntimes="osx-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libkrb5\libkrb5.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;osx-x64;osx-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjsound\libjsound.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjsound\libjsound.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjsoundds\libjsoundds.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjsoundalsa\libjsoundalsa.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libsctp\libsctp.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libsctp\libsctp.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;android-arm;android-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libmlib_image\libmlib_image.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libawt_xawt\libawt_xawt.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\liblcms\liblcms.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\liblcms\liblcms.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;osx-x64;osx-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjpeg\libjpeg.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libawt_headless\libawt_headless.clangproj" SupportedRuntimes="linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libfontmanager\libfontmanager.clangproj" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libfontmanager\libfontmanager.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;osx-x64;osx-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libfreetype\libfreetype.clangproj" SupportedRuntimes="win-x86;win-x64;win-arm64;osx-x64;osx-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libjawt\libjawt.clangproj" SupportedRuntimes="win-x64;win-x86;win-arm64;linux-arm;linux-arm64;linux-x64;linux-musl-arm;linux-musl-arm64;linux-musl-x64;osx-x64;osx-arm64" />
<DotNetClangProjectReference Include="$(MSBuildThisFileDirectory)..\libawt_lwawt\libawt_lwawt.clangproj" SupportedRuntimes="osx-x64;osx-arm64" />
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.props" />

<PropertyGroup>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM Runtime Image</Description>
<IncludeSymbols>false</IncludeSymbols>
<ImageRuntimeIdentifier>android-arm</ImageRuntimeIdentifier>
<SupportedImageTargetFrameworks>net6.0;net8.0</SupportedImageTargetFrameworks>
</PropertyGroup>

<Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\IKVM.Image.runtime.targets" />
</Project>

3 changes: 3 additions & 0 deletions src/IKVM.Image.runtime.android-arm/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# IKVM.Image

Native requirements for IKVM.Image.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\any\android-arm\**\*">
<TargetFramework>any</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\android-arm\**\*">
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net8.0\android-arm\**\*">
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>android-arm</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm/lib/net472/_._
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm/lib/net6.0/_._
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm/lib/net8.0/_._
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
<Project>
<Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.props" />

<PropertyGroup>
<TargetFrameworks>net472;net6.0;net8.0</TargetFrameworks>
<PackageLicenseFile>LICENSE.md</PackageLicenseFile>
<PackageReadmeFile>README.md</PackageReadmeFile>
<Description>IKVM Runtime Image</Description>
<IncludeSymbols>false</IncludeSymbols>
<ImageRuntimeIdentifier>android-arm64</ImageRuntimeIdentifier>
<SupportedImageTargetFrameworks>net6.0;net8.0</SupportedImageTargetFrameworks>
</PropertyGroup>

<Import Sdk="Microsoft.Build.NoTargets" Project="Sdk.targets" />
<Import Project="$(MSBuildThisFileDirectory)..\IKVM.Image\IKVM.Image.runtime.targets" />
</Project>

3 changes: 3 additions & 0 deletions src/IKVM.Image.runtime.android-arm64/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
# IKVM.Image

Native requirements for IKVM.Image.
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
<Project>
<PropertyGroup>
<MSBuildAllProjects>$(MSBuildAllProjects);$(MSBuildThisFileFullPath)</MSBuildAllProjects>
</PropertyGroup>

<ItemGroup>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\any\android-arm64\**\*">
<TargetFramework>any</TargetFramework>
<RuntimeIdentifier>android-arm64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net6.0\android-arm64\**\*">
<TargetFramework>net6.0</TargetFramework>
<RuntimeIdentifier>android-arm64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
<IkvmImageItem Include="$(MSBuildThisFileDirectory)..\ikvm\net8.0\android-arm64\**\*">
<TargetFramework>net8.0</TargetFramework>
<RuntimeIdentifier>android-arm64</RuntimeIdentifier>
<ImagePath>%(RecursiveDir)%(FileName)%(Extension)</ImagePath>
</IkvmImageItem>
</ItemGroup>

</Project>
1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm64/lib/net472/_._
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm64/lib/net6.0/_._
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

1 change: 1 addition & 0 deletions src/IKVM.Image.runtime.android-arm64/lib/net8.0/_._
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@

2 changes: 2 additions & 0 deletions src/IKVM.Image/IKVM.Image.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
<ProjectReference Include="..\IKVM.Image.runtime.linux-musl-arm64\IKVM.Image.runtime.linux-musl-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm64;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.osx-x64\IKVM.Image.runtime.osx-x64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-x64;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.osx-arm64\IKVM.Image.runtime.osx-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';android-arm;'))" />
<ProjectReference Include="..\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj" ReferenceOutputAssembly="true" Condition="$(_EnabledImageRuntimes.Contains(';android-arm64;'))" />
</ItemGroup>

<ItemGroup>
Expand Down
6 changes: 3 additions & 3 deletions src/IKVM.Image/IKVM.Image.runtime.targets
Original file line number Diff line number Diff line change
Expand Up @@ -29,16 +29,16 @@

<PropertyGroup>
<OpenJdkTargetOsApiDir Condition="$(ImageRuntimeIdentifier.StartsWith('win-'))">windows</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsApiDir Condition="$(ImageRuntimeIdentifier.StartsWith('linux-')) Or $(ImageRuntimeIdentifier.StartsWith('osx-'))">solaris</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsApiDir Condition="$(ImageRuntimeIdentifier.StartsWith('linux-')) Or $(ImageRuntimeIdentifier.StartsWith('osx-')) Or $(ImageRuntimeIdentifier.StartsWith('android-'))">solaris</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsDir Condition="$(ImageRuntimeIdentifier.StartsWith('win-'))">windows</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition="$(ImageRuntimeIdentifier.StartsWith('linux-'))">linux</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition="$(ImageRuntimeIdentifier.StartsWith('linux-')) Or $(ImageRuntimeIdentifier.StartsWith('android-'))">linux</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition="$(ImageRuntimeIdentifier.StartsWith('osx-'))">macosx</OpenJdkTargetOsDir>
</PropertyGroup>


<ItemGroup>
<IkvmImageItem Include="$(OpenJdkDir)jdk\src\windows\lib\flavormap.properties" TargetFramework="any" RuntimeIdentifier="$(ImageRuntimeIdentifier)" ImagePath="lib\flavormap.properties" Condition="$(ImageRuntimeIdentifier.StartsWith('win-'))"/>
<IkvmImageItem Include="$(OpenJdkDir)jdk\src\solaris\lib\flavormap.properties" TargetFramework="any" RuntimeIdentifier="$(ImageRuntimeIdentifier)" ImagePath="lib\flavormap.properties" Condition="$(ImageRuntimeIdentifier.StartsWith('linux-'))"/>
<IkvmImageItem Include="$(OpenJdkDir)jdk\src\solaris\lib\flavormap.properties" TargetFramework="any" RuntimeIdentifier="$(ImageRuntimeIdentifier)" ImagePath="lib\flavormap.properties" Condition="$(ImageRuntimeIdentifier.StartsWith('linux-')) OR $(ImageRuntimeIdentifier.StartsWith('android-'))"/>
<IkvmImageItem Include="$(OpenJdkDir)jdk\src\macosx\lib\flavormap.properties" TargetFramework="any" RuntimeIdentifier="$(ImageRuntimeIdentifier)" ImagePath="lib\flavormap.properties" Condition="$(ImageRuntimeIdentifier.StartsWith('osx-'))"/>
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/IKVM.Image/buildTransitive/IKVM.Image.targets
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

<ItemGroup>
<IkvmImageAvailableTargetFrameworks Include="net472;net6.0;net8.0" />
<IkvmImageAvailableRuntimeIdentifiers Include="win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64" />
<IkvmImageAvailableRuntimeIdentifiers Include="win-x64;win-x86;win-arm64;linux-x64;linux-arm;linux-arm64;linux-musl-x64;linux-musl-arm;linux-musl-arm64;osx-x64;osx-arm64;android-arm;android-arm64" />
</ItemGroup>

<Choose>
Expand Down
4 changes: 2 additions & 2 deletions src/IKVM.Java/IKVM.Java.runtime.props
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,9 @@

<PropertyGroup>
<OpenJdkTargetOsApiDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'win' Or '$(IkvmJavaRuntimeIdentifier)' == 'ref' ">windows</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsApiDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' Or '$(IkvmJavaRuntimeIdentifier)' == 'osx' ">solaris</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsApiDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' Or '$(IkvmJavaRuntimeIdentifier)' == 'osx' Or '$(IkvmJavaRuntimeIdentifier)' == 'android'">solaris</OpenJdkTargetOsApiDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'win' Or '$(IkvmJavaRuntimeIdentifier)' == 'ref' ">windows</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' ">linux</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'linux' Or '$(IkvmJavaRuntimeIdentifier)' == 'android' ">linux</OpenJdkTargetOsDir>
<OpenJdkTargetOsDir Condition=" '$(IkvmJavaRuntimeIdentifier)' == 'osx' ">macosx</OpenJdkTargetOsDir>
</PropertyGroup>

Expand Down
2 changes: 2 additions & 0 deletions src/IKVM.MSBuild.Tests/IKVM.MSBuild.Tests.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,8 @@
<PackageProjectReference Include="..\IKVM.Image.runtime.linux-musl-arm64\IKVM.Image.runtime.linux-musl-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';linux-musl-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.osx-x64\IKVM.Image.runtime.osx-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';osx-x64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.osx-arm64\IKVM.Image.runtime.osx-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';osx-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm\IKVM.Image.runtime.android-arm.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-arm;'))" />
<PackageProjectReference Include="..\IKVM.Image.runtime.android-arm64\IKVM.Image.runtime.android-arm64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';android-arm64;'))" />
<PackageProjectReference Include="..\IKVM.Image.JRE\IKVM.Image.JRE.csproj" PackageTargetPath="nuget" />
<PackageProjectReference Include="..\IKVM.Image.JRE.runtime.win-x64\IKVM.Image.JRE.runtime.win-x64.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';win-x64;'))" />
<PackageProjectReference Include="..\IKVM.Image.JRE.runtime.win-x86\IKVM.Image.JRE.runtime.win-x86.csproj" PackageTargetPath="nuget" Condition="$(_EnabledImageRuntimes.Contains(';win-x86;'))" />
Expand Down
Loading
Loading