Skip to content
Merged
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
3 changes: 1 addition & 2 deletions eng/Subsets.props
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,7 @@
<!-- Determine if the CoreCLR runtime can build/run for the specified target. -->
<_CoreCLRSupportedOS Condition="'$(TargetsMobile)' != 'true' and '$(TargetsLinuxBionic)' != 'true'">true</_CoreCLRSupportedOS>

Comment thread
simonrozsival marked this conversation as resolved.
<!-- Android 32-bit builds blocked by https://github.com/dotnet/runtime/issues/111665 -->
<_CoreCLRSupportedOS Condition="'$(TargetsAndroid)' == 'true' and '$(TargetArchitecture)' != 'arm' and '$(TargetArchitecture)' != 'x86'">true</_CoreCLRSupportedOS>
<_CoreCLRSupportedOS Condition="'$(TargetsAndroid)' == 'true' and '$(TargetArchitecture)' != 'x86'">true</_CoreCLRSupportedOS>
Comment thread
simonrozsival marked this conversation as resolved.
<_CoreCLRSupportedOS Condition="'$(TargetsBrowser)' == 'true'">true</_CoreCLRSupportedOS>
<_CoreCLRSupportedOS Condition="'$(TargetsAppleMobile)' == 'true'">true</_CoreCLRSupportedOS>

Expand Down
7 changes: 7 additions & 0 deletions eng/pipelines/coreclr/templates/helix-queues-setup.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,13 @@ jobs:
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- OSX.15.Amd64

# Android arm
- ${{ if in(parameters.platform, 'android_arm') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
- Windows.11.Amd64.Android.Open
- ${{ if eq(variables['System.TeamProject'], 'internal') }}:
- Windows.11.Amd64.Android

# Android arm64
- ${{ if in(parameters.platform, 'android_arm64') }}:
- ${{ if eq(variables['System.TeamProject'], 'public') }}:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -95,6 +95,7 @@ jobs:
buildConfig: Release
runtimeFlavor: coreclr
platforms:
- android_arm
Comment thread
simonrozsival marked this conversation as resolved.
- android_arm64
variables:
# map dependencies variables to local variables
Expand Down
3 changes: 2 additions & 1 deletion eng/pipelines/runtime.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1099,7 +1099,7 @@ extends:
eq(variables['isRollingBuild'], true))

#
# Android arm64 devices and x64 emulators
# Android arm/arm64 devices and x64 emulators
# Build the whole product using CoreCLR and run functional tests
#
- template: /eng/pipelines/common/platform-matrix.yml
Expand All @@ -1109,6 +1109,7 @@ extends:
buildConfig: Release
runtimeFlavor: coreclr
platforms:
- android_arm
Comment thread
simonrozsival marked this conversation as resolved.
- android_x64
- android_arm64
variables:
Expand Down
Loading