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

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

Merged
merged 15 commits into from
Jan 29, 2025
+136 −194
Merged

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

Changes from 1 commit
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
752511b
Move default AOT properties to a common props file
ivanpovazan Jan 17, 2025
b9f09c4
Use AndroidBuild.targets in AndroidSampleApp
ivanpovazan Jan 19, 2025
5800ff8
Adding a comment on usage of UseAotDataFile opt
ivanpovazan Jan 20, 2025
a071826
Relocate MonoAOTCompiler.props and ship it as part of LibraryBuilder.…
ivanpovazan Jan 21, 2025
d44d25e
Add functional test for Android library mode
ivanpovazan Jan 21, 2025
597de84
We need the comment as we are referring to OS versions in the AOT com…
ivanpovazan Jan 21, 2025
80486c8
Disable the library mode tests
ivanpovazan Jan 22, 2025
60bb3da
Do not force UseMonoRuntime in AndroidBuild.props
ivanpovazan Jan 24, 2025
156cc0e
Avoid using CoreCLR properties when building mono runtime tests
ivanpovazan Jan 24, 2025
0c11380
Revert "Avoid using CoreCLR properties when building mono runtime tests"
ivanpovazan Jan 28, 2025
474d44d
workaround for runtime tests which imports coreCLR Directory.Build.pr…
ivanpovazan Jan 28, 2025
831c6e9
Merge remote-tracking branch 'upstream/main' into helloandroid
ivanpovazan Jan 28, 2025
35145cb
Adapt build integration targets to work with CoreCLR
ivanpovazan Jan 28, 2025
d242a8c
Use RuntimeHeaders everywhere
ivanpovazan Jan 28, 2025
bac92ad
Link issues for TODOs
ivanpovazan Jan 28, 2025
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
Prev Previous commit
Next Next commit
workaround for runtime tests which imports coreCLR Directory.Build.pr… 
…ops and forces UseMonoRuntime=false
@ivanpovazan
ivanpovazan committed Jan 28, 2025
commit 474d44d7c61669e9e1ecca1a54b27d561cad1305
2 changes: 1 addition & 1 deletion src/mono/msbuild/android/build/AndroidBuild.props
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Project>
<PropertyGroup>
<RuntimeIdentifier>$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())</RuntimeIdentifier>
<UseMonoRuntime Condition="'$(UseMonoRuntime)' == ''">true</UseMonoRuntime>
<UseMonoRuntime Condition="'$(UseMonoRuntime)' == '' or '$(RuntimeFlavor.ToLower())' == 'mono'">true</UseMonoRuntime>
<UseMonoJustInterp Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' == 'true'">true</UseMonoJustInterp>

<_HostOS Condition="$([MSBuild]::IsOSPlatform('Windows'))">windows</_HostOS>
2 changes: 1 addition & 1 deletion src/mono/msbuild/apple/build/AppleBuild.props
View file
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
<PropertyGroup>
<iOSLikeDedup Condition="'$(iOSLikeDedup)' == '' and '$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' != 'true'">true</iOSLikeDedup>
<RuntimeIdentifier>$(TargetOS)-$(TargetArchitecture.ToLowerInvariant())</RuntimeIdentifier>
<UseMonoRuntime Condition="'$(UseMonoRuntime)' == ''">true</UseMonoRuntime>
<UseMonoRuntime Condition="'$(UseMonoRuntime)' == '' or '$(RuntimeFlavor.ToLower())' == 'mono'">true</UseMonoRuntime>
<UseMonoJustInterp Condition="'$(RunAOTCompilation)' == 'true' and '$(MonoForceInterpreter)' == 'true'">true</UseMonoJustInterp>

<StripDebugSymbols Condition="'$(StripDebugSymbols)' == ''" >false</StripDebugSymbols>