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.

Move the current library's node to be the last transitive element instead,
so it is visited last in preorder iteration and 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 the dep
node appears before the consumer node in direct_resources_nodes and that the
consumer's value of string.my_string wins over the dependency's.

Author: olbapmar

rules/resources.bzl

@@ -1698,23 +1698,28 @@ def _process_starlark(
             package = java_package,
         ))
     else:
-        # Depsets are ordered below to match the order in the legacy native rules.
+        # The busybox uses last-wins semantics for duplicate resource names, so the current
+        # library's node must appear last in preorder iteration to correctly override its
+        # dependencies' resources (matching native Bazel and Gradle behavior). Build a depset
+        # for the current node and append it after the deps' and exports' nodes.
+        current_resources_node = depset(
+            [ResourcesNodeInfo(
+                label = ctx.label,
+                assets = depset(assets),
+                assets_dir = assets_dir,
+                assets_symbols = parsed_assets,
+                compiled_assets = compiled_assets,
+                resource_apks = depset(resource_apks),
+                resource_files = depset(processed_resources),
+                compiled_resources = compiled_resources,
+                r_txt = out_aapt2_r_txt,
+                manifest = processed_manifest,
+                exports_manifest = exports_manifest,
+            )] if defines_resources else [],
+        )
         resources_ctx[_PROVIDERS].append(StarlarkAndroidResourcesInfo(
             direct_resources_nodes = depset(
-                [ResourcesNodeInfo(
-                    label = ctx.label,
-                    assets = depset(assets),
-                    assets_dir = assets_dir,
-                    assets_symbols = parsed_assets,
-                    compiled_assets = compiled_assets,
-                    resource_apks = depset(resource_apks),
-                    resource_files = depset(processed_resources),
-                    compiled_resources = compiled_resources,
-                    r_txt = out_aapt2_r_txt,
-                    manifest = processed_manifest,
-                    exports_manifest = exports_manifest,
-                )] if defines_resources else [],
-                transitive = direct_resources_nodes + exports_direct_resources_nodes,
+                transitive = direct_resources_nodes + exports_direct_resources_nodes + [current_resources_node],
                 order = "preorder",
             ),
             transitive_resources_nodes = depset(

test/rules/resources/BUILD

@@ -1888,3 +1888,55 @@ 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 current library's ResourcesNodeInfo must appear LAST in preorder
+# iteration of direct_resources_nodes so the busybox picks its value.
+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(
+        # Dep node first, consumer node last — consumer's value wins with
+        # busybox last-wins semantics when both define string.my_string.
+        direct_resources_nodes = [
+            another_resource_processing_lib_resources_node,
+            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 = [],
+    ),
+    target_under_test = ":consumer_with_conflicting_dep_resources",
+)