Skip to content

Fix resource merge priority so consumer library overrides dependency resources #464

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
olbapmar wants to merge 1 commit into
base: main
Choose a base branch
from
+10 −4
Open

Fix resource merge priority so consumer library overrides dependency resources #464

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
14 changes: 10 additions & 4 deletions rules/busybox.bzl
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,15 +311,17 @@ def _package(
map_each = _make_package_resources_flags,
join_with = ",",
)
# Reverse so the current library's node (first in preorder) ends up last,
# matching busybox last-wins semantics: a library's resources override its deps.
args.add_joined(
"--directData",
direct_resources_nodes,
reversed(direct_resources_nodes.to_list()),
map_each = _make_package_resources_flags,
join_with = ",",
)
args.add_joined(
"--directAssets",
direct_resources_nodes,
reversed(direct_resources_nodes.to_list()),
map_each = _make_package_assets_flags,
join_with = "&",
omit_if_empty = True,
Expand Down Expand Up @@ -532,9 +534,11 @@ def _merge_assets(
symbols = symbols,
),
)
# Reverse so the current library's node (first in preorder) ends up last,
# matching busybox last-wins semantics.
args.add_joined(
"--directData",
direct_resources_nodes,
reversed(direct_resources_nodes.to_list()),
map_each = _make_merge_assets_flags,
join_with = "&",
)
Expand Down Expand Up @@ -782,9 +786,11 @@ def _merge_compiled(
),
)
input_files.append(compiled_resources)
# Reverse so the current library's node (first in preorder) ends up last,
# matching busybox last-wins semantics.
args.add_joined(
"--directData",
direct_resources_nodes,
reversed(direct_resources_nodes.to_list()),
map_each = _make_merge_compiled_flags,
join_with = "&",
)
Expand Down