Skip to content

[Android] Add option to skip generating apk for a specific project #80909

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

Merged
merged 3 commits into from
Jan 24, 2023
Merged

[Android] Add option to skip generating apk for a specific project #80909

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
289e726
Add option to skip generating apk for a specific project
simonrozsival Jan 20, 2023
33697e2
Merge branch 'main' of https://github.com/dotnet/runtime into android…
simonrozsival Jan 23, 2023
969999d
Replace _SkipAndroidGenerateAppBundle with AndroidGenerateAppBundle
simonrozsival Jan 23, 2023
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
9 changes: 8 additions & 1 deletion src/mono/msbuild/android/build/AndroidApp.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,10 @@
<UsingTask TaskName="AndroidAppBuilderTask"
AssemblyFile="$(AndroidAppBuilderTasksAssemblyPath)" />

<PropertyGroup>
<AndroidGenerateAppBundle Condition="'$(AndroidGenerateAppBundle)' == ''">true</AndroidGenerateAppBundle>
</PropertyGroup>

<Target Name="AndroidBuildApp" AfterTargets="$(AndroidBuildAppAfterThisTarget)" />

<Target Name="_AndroidCoreBuild" BeforeTargets="AndroidBuildApp" DependsOnTargets="$(AndroidBuildAppDependsOn)" />
Expand Down Expand Up @@ -120,7 +124,10 @@
</Target>


<Target Name="_AndroidGenerateAppBundle" DependsOnTargets="_AndroidGenerateRuntimeConfig">
<Target
Name="_AndroidGenerateAppBundle"
Condition="$(AndroidGenerateAppBundle) == 'true'"
DependsOnTargets="_AndroidGenerateRuntimeConfig">

<PropertyGroup>
<RuntimeComponents Condition="'$(RuntimeComponents)' == ''" >marshal-ilgen</RuntimeComponents>
Expand Down
1 change: 1 addition & 0 deletions ...nctionalTests/TestAssets/StartupHookForFunctionalTest/StartupHookForFunctionalTest.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
<TargetFramework>$(NetCoreAppCurrent)</TargetFramework>
<IsTestProject>false</IsTestProject>
<IsFunctionalTest>false</IsFunctionalTest>
<AndroidGenerateAppBundle>false</AndroidGenerateAppBundle>
</PropertyGroup>

<ItemGroup>
Expand Down