Commit da98eb3
committed
Fix CheckNothingIsDeletedByIncrementalClean by moving _RemoveRegisterFlag to stamp directory
The _RemoveRegisterAttribute target's stamp file (shrunk.flag) was located at
$(MonoAndroidIntermediateAssemblyDir)shrunk/shrunk.flag, inside the tree
globbed by <FileWrites Include="$(MonoAndroidIntermediateAssemblyDir)**" />.
Since _RemoveRegisterAttribute runs during SignAndroidPackage (after
IncrementalClean), the glob didn't capture the stamp on build 1 but did on
build 2, causing FileListAbsolute.txt to grow.
Fix by:
- Moving the stamp to $(_AndroidStampDirectory)_RemoveRegisterAttribute.stamp,
following the existing naming convention for stamp files
- Adding _RemoveRegisterAttribute to IncrementalCleanDependsOn so it runs
before _AddFilesToFileWrites, ensuring the stamp exists when the
$(_AndroidStampDirectory)*.stamp glob captures it
- Removing the now-unnecessary MakeDir for the old shrunk directory (it was
only needed for the flag file, not for shrunk assemblies which go to the
publish directory)1 parent 9f693f3 commit da98eb3
File tree
4 files changed
+8
-9
lines changed- src/Xamarin.Android.Build.Tasks
- Microsoft.Android.Sdk/targets
- Tests/Xamarin.Android.Build.Tests
4 files changed
+8
-9
lines changedLines changed: 1 addition & 0 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
54 | 54 | | |
55 | 55 | | |
56 | 56 | | |
| 57 | + | |
57 | 58 | | |
58 | 59 | | |
59 | 60 | | |
| |||
Lines changed: 1 addition & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
9 | 9 | | |
10 | 10 | | |
11 | 11 | | |
12 | | - | |
| 12 | + | |
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
| |||
325 | 325 | | |
326 | 326 | | |
327 | 327 | | |
328 | | - | |
329 | 328 | | |
330 | 329 | | |
331 | 330 | | |
| |||
Lines changed: 6 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
143 | 143 | | |
144 | 144 | | |
145 | 145 | | |
146 | | - | |
147 | | - | |
148 | | - | |
149 | | - | |
150 | | - | |
151 | | - | |
| 146 | + | |
| 147 | + | |
| 148 | + | |
| 149 | + | |
| 150 | + | |
| 151 | + | |
152 | 152 | | |
153 | 153 | | |
154 | 154 | | |
| |||
Lines changed: 0 additions & 1 deletion
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
1917 | 1917 | | |
1918 | 1918 | | |
1919 | 1919 | | |
1920 | | - | |
1921 | 1920 | | |
1922 | 1921 | | |
1923 | 1922 | | |
| |||
0 commit comments