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

Initial Mono Android CI #34125

Merged
merged 19 commits into from
Apr 2, 2020
Merged

Initial Mono Android CI #34125

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
19 commits
Select commit Hold shift + click to select a range
f39c7f7
Initial Mono Android CI
directhex Mar 26, 2020
e9df169
Force an ANDROID_NDK_HOME value
directhex Mar 26, 2020
83da088
Switch to the same CentOS7 image as Linux x86 (for now)
directhex Mar 26, 2020
9324f6c
Use AzDO to unpack NDK, since there's no `unzip` in our CentOS images
directhex Mar 26, 2020
f608e36
Revert "Use AzDO to unpack NDK, since there's no `unzip` in our CentO…
directhex Mar 26, 2020
a0ea317
Install unzip command
directhex Mar 26, 2020
a1d5112
Use our new Android builder image
directhex Mar 30, 2020
e7e9b06
Install some extra dependencies post-hoc
directhex Mar 30, 2020
06abe51
Merge remote-tracking branch 'origin/master' into azdo-android
directhex Mar 30, 2020
a0eda1f
Revert "Install some extra dependencies post-hoc"
directhex Mar 30, 2020
e50fdbb
Bump Android image
directhex Mar 31, 2020
2a5cb04
Bump Android image
akoeplinger Apr 1, 2020
211a5d0
Update build-native.sh
akoeplinger Apr 1, 2020
c4bacb7
Force `-os Android` for Android, else it tries to do Linux
directhex Apr 1, 2020
8b0895c
Try forcing export, to ensure these variables are passed
directhex Apr 1, 2020
7817f51
Add Android x86, which is a thing apparently
directhex Apr 1, 2020
d911bf8
Add Android to official builds
directhex Apr 1, 2020
44e0c2d
Remove "not on android" condition from --build-id flag
directhex Apr 1, 2020
43e3e4c
Fix typo
directhex Apr 1, 2020
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
88 changes: 88 additions & 0 deletions eng/pipelines/common/platform-matrix.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,94 @@ jobs:
# asArray: []
# ${{ insert }}: ${{ parameters.jobParameters }}

# Android x64

- ${{ if containsValue(parameters.platforms, 'Android_x64') }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
osGroup: Android
archType: x64
platform: Android_x64
container:
image: ubuntu-18.04-android-20200401093035-1517ea2
registry: mcr
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
${{ if eq(parameters.passPlatforms, true) }}:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Android x86

- ${{ if containsValue(parameters.platforms, 'Android_x86') }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
osGroup: Android
archType: x86
platform: Android_x86
container:
image: ubuntu-18.04-android-20200401093035-1517ea2
registry: mcr
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
${{ if eq(parameters.passPlatforms, true) }}:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Android arm

- ${{ if containsValue(parameters.platforms, 'Android_arm') }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
osGroup: Android
archType: arm
platform: Android_arm
container:
image: ubuntu-18.04-android-20200401093035-1517ea2
registry: mcr
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
${{ if eq(parameters.passPlatforms, true) }}:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# Android arm64

- ${{ if containsValue(parameters.platforms, 'Android_arm64') }}:
- template: xplat-setup.yml
parameters:
jobTemplate: ${{ parameters.jobTemplate }}
helixQueuesTemplate: ${{ parameters.helixQueuesTemplate }}
osGroup: Android
archType: arm64
platform: Android_arm64
container:
image: ubuntu-18.04-android-20200401093035-1517ea2
registry: mcr
jobParameters:
runtimeFlavor: mono
stagedBuild: ${{ parameters.stagedBuild }}
buildConfig: ${{ parameters.buildConfig }}
${{ if eq(parameters.passPlatforms, true) }}:
platforms: ${{ parameters.platforms }}
helixQueueGroup: ${{ parameters.helixQueueGroup }}
${{ insert }}: ${{ parameters.jobParameters }}

# iOS x64

- ${{ if containsValue(parameters.platforms, 'iOS_x64') }}:
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/common/xplat-setup.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,10 @@ jobs:
- name: ROOTFS_DIR
value: ${{ parameters.jobParameters.crossrootfsDir }}

- ${{ if eq(parameters.osGroup, 'Android') }}:
- name: ANDROID_NDK_HOME
value: /usr/local/ndk

- name: runtimeFlavorName
${{ if eq(parameters.jobParameters.runtimeFlavor, 'mono') }}:
value: Mono
Expand Down
4 changes: 4 additions & 0 deletions eng/pipelines/libraries/base-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,10 @@ jobs:
- ${{ if eq(parameters.osGroup, 'iOS') }}:
- _runtimeOSArg: -os ${{ parameters.osGroup }}

# force a value for OS when cross-building Android on Linux
- ${{ if eq(parameters.osGroup, 'Android') }}:
- _runtimeOSArg: -os ${{ parameters.osGroup }}

- ${{ if ne(parameters.framework, '') }}:
- _finalFrameworkArg: -framework ${{ parameters.framework }}
- _extraHelixArguments: /p:BuildTargetFramework=${{ parameters.framework }}
Expand Down
3 changes: 3 additions & 0 deletions eng/pipelines/mono/templates/build-job.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,9 @@ jobs:
- ${{ if eq(parameters.osGroup, 'iOS') }}:
- name: osOverride
value: -os iOS
- ${{ if eq(parameters.osGroup, 'Android') }}:
- name: osOverride
value: -os Android
- ${{ parameters.variables }}

steps:
Expand Down
8 changes: 8 additions & 0 deletions eng/pipelines/runtime-official.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,10 @@ stages:
runtimeFlavor: mono
buildConfig: release
platforms:
- Android_x64
- Android_x86
- Android_arm
- Android_arm64
- iOS_x64
- iOS_arm
- iOS_arm64
Expand Down Expand Up @@ -116,6 +120,10 @@ stages:
buildConfig: Release
runtimeFlavor: mono
platforms:
- Android_x64
- Android_x86
- Android_arm
- Android_arm64
- iOS_x64
- iOS_arm
- iOS_arm64
Expand Down
16 changes: 16 additions & 0 deletions eng/pipelines/runtime.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -231,6 +231,10 @@ jobs:
runtimeFlavor: mono
buildConfig: debug
platforms:
- Android_x64
- Android_x86
- Android_arm
- Android_arm64
- iOS_x64
- iOS_arm
- iOS_arm64
Expand Down Expand Up @@ -261,6 +265,10 @@ jobs:
runtimeFlavor: mono
buildConfig: release
platforms:
- Android_x64
- Android_x86
- Android_arm
- Android_arm64
- iOS_x64
- iOS_arm
- iOS_arm64
Expand Down Expand Up @@ -378,6 +386,10 @@ jobs:
buildConfig: Release
runtimeFlavor: mono
platforms:
- Android_x64
- Android_x86
- Android_arm
- Android_arm64
- iOS_arm
- iOS_arm64
- iOS_x64
Expand All @@ -390,6 +402,10 @@ jobs:
buildConfig: Debug
runtimeFlavor: mono
platforms:
- Android_x64
- Android_x86
- Android_arm
- Android_arm64
- iOS_arm
- iOS_arm64
- iOS_x64
Expand Down
4 changes: 4 additions & 0 deletions src/libraries/Native/build-native.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ elif [[ "$__TargetOS" == Android && -z "$ROOTFS_DIR" ]]; then
# keep ANDROID_NATIVE_API_LEVEL in sync with src/mono/Directory.Build.props
__CMakeArgs="-DCMAKE_TOOLCHAIN_FILE=$ANDROID_NDK_HOME/build/cmake/android.toolchain.cmake -DANDROID_STL=none -DANDROID_NATIVE_API_LEVEL=21 $__CMakeArgs"

# workaround init-compiler.sh trying to detect clang, it's handled in android.toolchain.cmake already
export CLR_CC=$(which false)
export CLR_CXX=$(which false)

if [[ "$__BuildArch" == x64 ]]; then
__CMakeArgs="-DANDROID_ABI=x86_64 $__CMakeArgs"
elif [[ "$__BuildArch" == x86 ]]; then
Expand Down
2 changes: 1 addition & 1 deletion src/mono/mono.proj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@
</PropertyGroup>

<!-- Linux options -->
<ItemGroup Condition="'$(TargetsLinux)' == true and '$(TargetsAndroid)' != 'true'">
<ItemGroup Condition="'$(TargetsLinux)' == true">
<_MonoCFLAGS Include="-Wl,--build-id" />
<_MonoCXXFLAGS Include="-Wl,--build-id" />
</ItemGroup>
Expand Down