Commit 708f063
committed
Apply subset of bazelbuild#273
That PR includes a flag to use the original behavior, which we don't
care about.
From [the originating issue](bazelbuild#272):
> Our large project include duplicated android resources. We recently
> hit a bug when our developers introduced a dependency to a new third
> party library, which contains an android resource with the same name
> as one used in our top-level target. This is due to the fact the old
> APPT1 behavior is currently preserved, and the defined resources in
> the list provided to Aapt2ResourcePackagingAction 'wins'.
> The expectation is that the closest value defined from the app wins.
>
> The project below exemplify this (bogus) behavior: app defines
> resource app_name and app_name2 (with same value), depends directly
(or transitively) on library lib, which defines also app_name.
> In the final APK, app_name has the value from lib.
>
> This is problematic for projects tolerating duplicated resource, as,
> even with warnings, breaks can easily be introduced as any code change
> or third party library bump could possibly overwrite the value defined
> in top level target.
>
> The workaround we're using is to reverse the input order in Aapt2ResourcePackagingAction.1 parent 24bf097 commit 708f063
1 file changed
Lines changed: 5 additions & 3 deletions
Lines changed: 5 additions & 3 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
41 | 41 | | |
42 | 42 | | |
43 | 43 | | |
| 44 | + | |
44 | 45 | | |
45 | 46 | | |
46 | 47 | | |
| |||
354 | 355 | | |
355 | 356 | | |
356 | 357 | | |
357 | | - | |
358 | | - | |
359 | | - | |
| 358 | + | |
| 359 | + | |
| 360 | + | |
| 361 | + | |
360 | 362 | | |
361 | 363 | | |
362 | 364 | | |
| |||
0 commit comments