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

Jump to bottom

[android] Internal Android sample build improvements and CoreCLR support #111545

Merged

ivanpovazan merged 15 commits into dotnet:main from ivanpovazan:helloandroid

Jan 29, 2025

Member

ivanpovazan commented Jan 17, 2025 •

edited

Loading

Description

This PR:

simplifies the Android sample build process by moving default AOT properties to a common props file and using AndroidBuild.targets in AndroidSampleApp.
adds and enables library mode testing: Android.Device_Emulator.LibraryMode_Aot_Llvm.Test.csproj on Android for x64 and arm64 architectures.
- NOTE: The add test fails to build on arm and x86 architectures for which the test is disabled and tracking issue created: [mono][android][tests] Library mode functional tests fail to build on android arm/x86 #111699
enables AndroidBuild.targets to opt-in for building the sample and functional tests with CoreCLR

CoreCLR support verification

Functional test

Verified on osx-arm64 host that the following build/run commands run a functional test on CoreCLR:

Building:

./build.sh clr.runtime+clr.alljits+clr.corelib+clr.nativecorelib+clr.tools+clr.packages+libs -os android -arch arm64 -c Release -cross -bl

Running:

./dotnet.sh build -c Release src/tests/FunctionalTests/Android/Device_Emulator/JIT/Android.Device_Emulator.JIT.Test.csproj /p:TargetOS=android /p:TargetArchitecture=arm64 /t:Test /p:RuntimeFlavor=coreclr

HelloAndroid

Build/run on a clean checkout:

make BUILD_CONFIG=Release TARGET_ARCH=arm64 RUNTIME_FLAVOR=CoreCLR DEPLOY_AND_RUN=true all -C src/mono/sample/Android

Fixes: #110811
Contributes to: #111745

ivanpovazan added NO-MERGE NO-REVIEW labels

dotnet-issue-labeler bot added the area-Infrastructure-mono label

Member Author

ivanpovazan commented Jan 17, 2025

/azp run runtime-android, runtime-androidemulator

dotnet-policy-service bot assigned ivanpovazan

azure-pipelines bot commented Jan 17, 2025

Azure Pipelines successfully started running 2 pipeline(s).

build-analysis bot mentioned this pull request

[wasm][mt] fail: System.TypeLoadException: Could not load type of field" #102615

Open

Member Author

ivanpovazan commented Jan 19, 2025

/azp run runtime-android, runtime-androidemulator

azure-pipelines bot commented Jan 19, 2025

Azure Pipelines successfully started running 2 pipeline(s).

ivanpovazan force-pushed the helloandroid branch from 324207b to 99460e7 Compare

January 19, 2025 15:11

Member Author

ivanpovazan commented Jan 19, 2025

/azp run runtime-android, runtime-androidemulator

azure-pipelines bot commented Jan 19, 2025

Azure Pipelines successfully started running 2 pipeline(s).

Member Author

ivanpovazan commented Jan 19, 2025

/azp run runtime-android, runtime-androidemulator

azure-pipelines bot commented Jan 19, 2025

Azure Pipelines successfully started running 2 pipeline(s).

ivanpovazan changed the title ~~[WIP][android] Internal Android build improvements~~ [android] Internal Android sample build improvements

ivanpovazan added os-android and removed NO-MERGE NO-REVIEW labels

ivanpovazan added this to the 10.0.0 milestone

ivanpovazan marked this pull request as ready for review

January 19, 2025 19:21

ivanpovazan requested review from akoeplinger, steveisok and vitek-karas as code owners

January 19, 2025 19:21

ivanpovazan requested review from jkurdek, steveisok and akoeplinger and removed request for steveisok, akoeplinger and vitek-karas

January 19, 2025 19:21

matouskozak reviewed

View reviewed changes

src/mono/sample/Android/AndroidSampleApp.csproj Outdated Show resolved Hide resolved

ivanpovazan added 4 commits

January 24, 2025 14:49


          Add functional test for Android library mode

d44d25e


          We need the comment as we are referring to OS versions in the AOT com…

597de84

…piler props


          Disable the library mode tests

80486c8


          Do not force UseMonoRuntime in AndroidBuild.props

60bb3da

ivanpovazan force-pushed the helloandroid branch from 8f3a933 to 60bb3da Compare

January 24, 2025 13:52

Member Author

ivanpovazan commented Jan 24, 2025

/azp run runtime-extra-platforms

azure-pipelines bot commented Jan 24, 2025

Azure Pipelines successfully started running 1 pipeline(s).


          Avoid using CoreCLR properties when building mono runtime tests

156cc0e

Member Author

ivanpovazan commented Jan 27, 2025

/azp run runtime-extra-platforms

azure-pipelines bot commented Jan 27, 2025

Pull request contains merge conflicts.

ivanpovazan added 4 commits

January 28, 2025 09:37


          Revert "Avoid using CoreCLR properties when building mono runtime tests"

0c11380

This reverts commit 156cc0e.


          workaround for runtime tests which imports coreCLR Directory.Build.pr…

474d44d

…ops and forces UseMonoRuntime=false


          Merge remote-tracking branch 'upstream/main' into helloandroid

831c6e9


          Adapt build integration targets to work with CoreCLR

35145cb

Member Author

ivanpovazan commented Jan 28, 2025

/azp run runtime-extra-platforms

azure-pipelines bot commented Jan 28, 2025

Azure Pipelines successfully started running 1 pipeline(s).


          Use RuntimeHeaders everywhere

d242a8c

Member Author

ivanpovazan commented Jan 28, 2025

/azp run runtime-extra-platforms

azure-pipelines bot commented Jan 28, 2025

Azure Pipelines successfully started running 1 pipeline(s).


          Link issues for TODOs

bac92ad

Member Author

ivanpovazan commented Jan 28, 2025

/azp run runtime-extra-platforms

ivanpovazan requested a review from kotlarmilos

January 28, 2025 18:09

azure-pipelines bot commented Jan 28, 2025

Azure Pipelines successfully started running 1 pipeline(s).

ivanpovazan changed the title ~~[android] Internal Android sample build improvements~~ [android] Internal Android sample build improvements and CoreCLR support

matouskozak approved these changes

View reviewed changes

Member

matouskozak left a comment

Good job! I left a few comments on stuff that I wasn't sure about.

src/mono/msbuild/android/build/AndroidBuild.props Show resolved Hide resolved

src/mono/msbuild/android/build/AndroidBuild.props Show resolved Hide resolved

src/mono/msbuild/android/build/AndroidBuild.props Show resolved Hide resolved

src/mono/msbuild/android/build/AndroidBuild.targets Show resolved Hide resolved

src/tasks/AotCompilerTask/MonoAOTCompiler.csproj Show resolved Hide resolved

src/tests/FunctionalTests/Android/Device_Emulator/LibraryMode_AOT_LLVM/Program.cs Show resolved Hide resolved

Member Author

ivanpovazan commented Jan 29, 2025 •

edited

Loading

CI failures are unrelated.

ivanpovazan mentioned this pull request

[mono] Unify mobile build integration files and sample apps for non-Mono runtimes #111923

Open

2 tasks

kotlarmilos approved these changes

View reviewed changes

Member

kotlarmilos left a comment

LGTM!

ivanpovazan merged commit f71255e into dotnet:main

199 of 205 checks passed

ivanpovazan deleted the helloandroid branch

January 30, 2025 15:27

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

jkurdek jkurdek left review comments

matouskozak matouskozak approved these changes

akoeplinger akoeplinger left review comments

kotlarmilos kotlarmilos approved these changes

steveisok steveisok approved these changes

Labels

area-Infrastructure-mono os-android