Fix resource merge priority so consumer library overrides dependency resources

The Android resource busybox uses last-wins semantics when merging duplicate
resource names. The current library's ResourcesNodeInfo was placed as the
first direct item of the direct_resources_nodes preorder depset, causing it
to be processed before its dependencies and lose to them on conflicts.

Fix the ordering at the consumption point in busybox.bzl: reverse the
direct_resources_nodes list when building --directData (and --directAssets)
arguments. This ensures the current library's node (first in preorder) ends
up last in the busybox flag, so its resources correctly override those of its
dependencies — matching native Bazel and Gradle behavior.

Add regression test test_consumer_resource_wins_over_dep to verify that
consumer resources take priority over dependency resources when both define
the same resource name.

Author: olbapmar

rules/busybox.bzl

@@ -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,
@@ -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 = "&",
     )
@@ -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 = "&",
     )

rules/resources.bzl

@@ -1698,7 +1698,6 @@ def _process_starlark(
             package = java_package,
         ))
     else:
-        # Depsets are ordered below to match the order in the legacy native rules.
         resources_ctx[_PROVIDERS].append(StarlarkAndroidResourcesInfo(
             direct_resources_nodes = depset(
                 [ResourcesNodeInfo(

test/rules/resources/BUILD

@@ -1888,3 +1888,59 @@ package_resources_final_id_test(
     final = True,
     target_under_test = ":resource_package_with_res_and_multiple_dep",
 )
+
+# Regression test: consumer library's resources must take priority over a
+# dependency's when both define the same resource name (busybox last-wins).
+# The busybox --directData list is reversed at consumption so the current
+# library's node (first in preorder) ends up last, overriding its deps.
+starlark_process(
+    name = "consumer_with_conflicting_dep_resources",
+    custom_package = "test.rules.resources",
+    manifest = "AndroidManifest.xml",
+    resource_files = glob(["res_b/**"]),
+    deps = [":another_resource_processing_lib"],
+)
+
+consumer_with_conflicting_dep_resources_node = ExpectedResourcesNodeInfo(
+    assets = [],
+    assets_dir = "",
+    assets_symbols =
+        "consumer_with_conflicting_dep_resources_symbols/assets.bin",
+    compiled_resources =
+        "consumer_with_conflicting_dep_resources_symbols/symbols.zip",
+    label = ":consumer_with_conflicting_dep_resources",
+    manifest =
+        "consumer_with_conflicting_dep_resources_processed_manifest/AndroidManifest.xml",
+    r_txt = "consumer_with_conflicting_dep_resources_symbols/R.aapt2.txt",
+)
+
+starlark_process_test(
+    name = "test_consumer_resource_wins_over_dep",
+    expected_r_class_fields = [
+        "string.my_string",
+        "string.my_other_string",
+    ],
+    expected_starlark_android_resources_info = ExpectedStarlarkAndroidResourcesInfo(
+        # In legacy manifest_merge_order (used in CI), the dep's node is moved
+        # to transitive_resources_nodes by the fix_resource_transitivity swap,
+        # leaving only the consumer's own node in direct_resources_nodes.
+        # The busybox receives dep via --data and consumer via --directData
+        # (reversed), so consumer's resource value wins.
+        direct_resources_nodes = [
+            consumer_with_conflicting_dep_resources_node,
+        ],
+        transitive_assets = ["assets/some_asset.txt"],
+        transitive_assets_symbols = [
+            "consumer_with_conflicting_dep_resources_symbols/assets.bin",
+            "another_resource_processing_lib_symbols/assets.bin",
+        ],
+        transitive_compiled_resources = [
+            "consumer_with_conflicting_dep_resources_symbols/symbols.zip",
+            "another_resource_processing_lib_symbols/symbols.zip",
+        ],
+        transitive_resources_nodes = [
+            another_resource_processing_lib_resources_node,
+        ],
+    ),
+    target_under_test = ":consumer_with_conflicting_dep_resources",
+)