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 #111545

Open

ivanpovazan wants to merge 6 commits into dotnet:main from ivanpovazan:helloandroid

Member

ivanpovazan commented Jan 17, 2025 •

edited

Loading

Description

In context of runtime consolidation efforts, this PR simplifies the Android sample build process by moving default AOT properties to a common props file and using AndroidBuild.targets in AndroidSampleApp.

Fixes: #110811

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).


          Move default AOT properties to a common props file

99460e7

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).


          Use AndroidBuild.targets in AndroidSampleApp

f6973ca

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 and steveisok and removed request for steveisok, akoeplinger and vitek-karas

January 19, 2025 19:21

ivanpovazan requested a review from akoeplinger

January 19, 2025 19:21

matouskozak reviewed

View reviewed changes

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

This was referenced Jan 19, 2025

slow macOS - "##[error]The job running on agent Azure Pipelines 9 ran longer than the maximum time of 60 minutes." dotnet/dnceng#1883

Open

The Operation will be canceled. The next steps may not contain expected logs. dotnet/dnceng#3008

Open


          Adding a comment on usage of UseAotDataFile opt

fc55602

Member Author

ivanpovazan commented Jan 20, 2025

/azp run runtime-android, runtime-androidemulator

azure-pipelines bot commented Jan 20, 2025

Azure Pipelines successfully started running 2 pipeline(s).

ivanpovazan requested a review from matouskozak

January 20, 2025 09:00

Member Author

ivanpovazan commented Jan 20, 2025

/azp run runtime-ioslike-mono

azure-pipelines bot commented Jan 20, 2025

No pipelines are associated with this pull request.

Member Author

ivanpovazan commented Jan 20, 2025

/azp run runtime-ioslike

azure-pipelines bot commented Jan 20, 2025

Azure Pipelines successfully started running 1 pipeline(s).

ivanpovazan requested a review from kotlarmilos

January 20, 2025 11:27

steveisok reviewed

View reviewed changes

src/mono/msbuild/android/build/AndroidBuild.targets Outdated

-                           TaskName="NdkToolFinderTask"
-                           AssemblyFile="$(MobileBuildTasksAssemblyPath)" />
+                <!-- Import default AOT arguments -->
+                <Import Condition="'$(RunAOTCompilation)' == 'true'" Project="$(RepoTasksDir)AotCompilerTask\MonoAOTCompiler.props" />

Member

steveisok Jan 20, 2025

The path to the props file needs generically set similarly to how we locate the task assembly.

See

runtime/src/mono/msbuild/android/build/AndroidBuild.InTree.targets

Line 3 in fc55602

    
           <UsingTask TaskName="MonoAOTCompiler" AssemblyFile="$(MonoAOTCompilerTasksAssemblyPath)" />

Member

steveisok Jan 20, 2025

It'll need to be shipped as well, so whatever property you define, add one here too.

runtime/src/mono/nuget/Microsoft.NET.Runtime.MonoTargets.Sdk/Sdk/MonoTargetsTasks.props.in

Lines 2 to 5 in fc55602

    
           <PropertyGroup> 
        
             <MonoTargetsTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' == 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetCoreAppToolCurrent}\MonoTargetsTasks.dll</MonoTargetsTasksAssemblyPath> 
        
             <MonoTargetsTasksAssemblyPath Condition="'$(MSBuildRuntimeType)' != 'Core'">$(MSBuildThisFileDirectory)..\tasks\${NetFrameworkToolCurrent}\MonoTargetsTasks.dll</MonoTargetsTasksAssemblyPath> 
        
           </PropertyGroup>

Member Author

ivanpovazan Jan 21, 2025

Thanks, please see: 0b338b8

Member Author

ivanpovazan Jan 21, 2025

Added a functional tests for testing library mode on CI,
Verified that the LibraryBuilder.Sdk.10.0.0-dev.nupkg contains the props file:

x _rels/.rels
x Microsoft.NET.Runtime.LibraryBuilder.Sdk.nuspec
x Icon.png
x LICENSE.TXT
x Sdk/AutoImport.props
x Sdk/Sdk.props
x Sdk/AndroidBuild.props
x Sdk/AndroidBuild.targets
x Sdk/AppleBuild.props
x Sdk/AppleBuild.targets
x Sdk/LibraryBuilder.props
x Sdk/LibraryBuilder.targets
x Sdk/CommonMobileBuild.props
x Sdk/MonoAOTCompiler.props
...

Verified that the properties are properly included with E2E test

Member

jkurdek commented Jan 21, 2025

I think we can close #110811 after the PR is merged

jkurdek reviewed

View reviewed changes

src/tasks/AotCompilerTask/MonoAOTCompiler.props

    
                <ItemGroup Condition="'$(TargetOS)' == 'android' or '$(TargetOS)' == 'ios' or '$(TargetOS)' == 'iossimulator' or '$(TargetOS)' == 'tvos' or '$(TargetOS)' == 'tvossimulator' or '$(TargetOS)' == 'maccatalyst'">

                  <!-- Default trampolines run out for libraries tests -->

                  <MonoAOTCompilerDefaultAotArguments Include="nimt-trampolines=2000" />

                  <MonoAOTCompilerDefaultAotArguments Include="ntrampolines=10000" />

                  <MonoAOTCompilerDefaultAotArguments Include="nrgctx-fetch-trampolines=256" />

                  <MonoAOTCompilerDefaultAotArguments Include="ngsharedvt-trampolines=4400" />

                  <MonoAOTCompilerDefaultAotArguments Include="nftnptr-arg-trampolines=4000" />

                  <MonoAOTCompilerDefaultAotArguments Include="nrgctx-trampolines=21000" />

Member

jkurdek Jan 21, 2025

Interesting, seems we had different values between sample and android/build. Great to see it unified


          Relocate MonoAOTCompiler.props and ship it as part of LibraryBuilder.…

0b338b8

…nupkg

Member Author

ivanpovazan commented Jan 21, 2025

/azp run runtime-android, runtime-androidemulator, runtime-ioslike

azure-pipelines bot commented Jan 21, 2025

Azure Pipelines successfully started running 3 pipeline(s).

akoeplinger reviewed

View reviewed changes

Directory.Build.props Show resolved Hide resolved

This was referenced Jan 21, 2025

restarted. Azure DevOps can't recover from restarts. dotnet/dnceng#3879

Open

[wasm] Out of memory exception in System.Xml.XmlWriterApiTests.TCFullEndElement tests #110090

Open

ivanpovazan added 2 commits

January 21, 2025 16:47


          Add functional test for Android library mode

0c0179b


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

771dcc5

…piler props

Member Author

ivanpovazan commented Jan 21, 2025

/azp run runtime-android, runtime-androidemulator, runtime-ioslike

azure-pipelines bot commented Jan 21, 2025

Azure Pipelines successfully started running 3 pipeline(s).

ivanpovazan commented

View reviewed changes

src/mono/msbuild/android/build/AndroidBuild.targets

    
            @@ -94,7 +93,7 @@
          
                  <PropertyGroup>

                    <_AOTMode Condition="'$(UseMonoJustInterp)' != 'true'">Normal</_AOTMode>

                    <_AOTMode Condition="'$(UseMonoJustInterp)' == 'true'">JustInterp</_AOTMode>

                    <_AOTMode Condition="'$(ForceFullAOT)' == 'true'">Full</_AOTMode>

                    <_AOTMode Condition="'$(ForceAOT)' == 'true' and '$(AOTWithLibraryFiles)' != 'true'">Full</_AOTMode>

Member Author

ivanpovazan Jan 21, 2025

@steveisok not sure if this is correct but I noticed we were using an undocumented property ForceFullAOT (I found its usage only on your library sample repo).
So I switched it to this combination, maybe it needs a refinement

This was referenced Jan 21, 2025

[browser][MT] test failure: Tests timed out. Killing driver service #103524

Open

[8.0][browser][wasm] Failed trying to read log messages via selenium: OpenQA.Selenium.WebDriverException: An unknown exception was encountered sending an HTTP request to the remote WebDriver server for URL #104825

Open

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

Reviewers

jkurdek jkurdek left review comments

akoeplinger akoeplinger left review comments

steveisok steveisok left review comments

matouskozak Awaiting requested review from matouskozak

kotlarmilos Awaiting requested review from kotlarmilos

At least 1 approving review is required to merge this pull request.

Labels

area-Infrastructure-mono os-android