Skip to content

[Build] Fix JNI remapping counts lost on incremental builds #11378

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

Open
simonrozsival wants to merge 8 commits into
base: main
Choose a base branch
from
+76 −4
Open

[Build] Fix JNI remapping counts lost on incremental builds #11378

Changes from 4 commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7782f6a
Fix JNI remapping counts lost on incremental builds
simonrozsival May 16, 2026
82e8257
Add test for JNI remapping info file round-trip
simonrozsival May 16, 2026
89fe8fa
Simplify: remove Inputs/Outputs from remap targets instead of file-ba…
simonrozsival May 16, 2026
845dab7
Merge branch 'main' into dev/simonrozsival/fix-jni-remapping-incremen…
simonrozsival May 20, 2026
21dd7ac
Add JNI remapping incremental build test
simonrozsival May 20, 2026
df9f24b
Fix JNI remapping regression test assertion
simonrozsival May 21, 2026
734eab3
Keep empty JNI remap target incremental
simonrozsival May 21, 2026
eb62a11
Avoid touching unchanged JNI remap sources
simonrozsival May 21, 2026
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
8 changes: 2 additions & 6 deletions src/Xamarin.Android.Build.Tasks/Xamarin.Android.Common.targets
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1631,9 +1631,7 @@ because xbuild doesn't support framework reference assemblies.

<Target Name="_GenerateEmptyAndroidRemapNativeCode"
DependsOnTargets="_PrepareAndroidRemapNativeAssemblySources"
Condition=" '@(_AndroidRemapMembers->Count())' == '0' "
Inputs="$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects)"
Outputs="@(_AndroidRemapAssemblySource)">
Condition=" '@(_AndroidRemapMembers->Count())' == '0' ">
<GenerateJniRemappingNativeCode
OutputDirectory="$(_NativeAssemblySourceDir)"
GenerateEmptyCode="True"
Expand All @@ -1652,9 +1650,7 @@ because xbuild doesn't support framework reference assemblies.

<Target Name="_GenerateAndroidRemapNativeCode"
DependsOnTargets="$(_GenerateAndroidRemapNativeCodeDependsOn)"
Condition=" '@(_AndroidRemapMembers->Count())' != '0' "
Inputs="$(_AndroidBuildPropertiesCache);@(_AndroidMSBuildAllProjects);$(_XARemapMembersFilePath)"
Outputs="@(_AndroidRemapAssemblySource)">
Condition=" '@(_AndroidRemapMembers->Count())' != '0' ">
<GenerateJniRemappingNativeCode
OutputDirectory="$(_NativeAssemblySourceDir)"
RemappingXmlFilePath="$(_XARemapMembersFilePath)"
Expand Down