Fix missing ownership (#1747)

bazelbuild · Nov 4, 2022 · f8b14ce · f8b14ce
1 parent c17af58
commit f8b14ce
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/apple/internal/partials/resources.bzl b/apple/internal/partials/resources.bzl
@@ -266,6 +266,7 @@ def _resources_partial_impl(
                 infoplists.extend(result.infoplists)
 
     resources.deduplicate(
+        default_owner = str(rule_label),
         resources_provider = final_provider,
         avoid_providers = avoid_providers,
         field_handler = _deduplicated_field_handler,

diff --git a/apple/internal/resources.bzl b/apple/internal/resources.bzl
@@ -880,12 +880,13 @@ def _deduplicate_field(
 
     return deduped_tuples
 
-def _deduplicate(*, resources_provider, avoid_providers, field_handler):
+def _deduplicate(*, resources_provider, avoid_providers, field_handler, default_owner = None):
     avoid_provider = None
     if avoid_providers:
         # Call merge_providers with validate_all_resources_owned set, to ensure that all the
         # resources from dependency bundles have an owner.
         avoid_provider = _merge_providers(
+            default_owner = default_owner,
             providers = avoid_providers,
             validate_all_resources_owned = True,
         )

diff --git a/doc/rules-resources.md b/doc/rules-resources.md
@@ -378,7 +378,7 @@ A list with all the collected resources for the target represented by attr.
 ## resources_common.deduplicate
 
 <pre>
-resources_common.deduplicate(<a href="#resources_common.deduplicate-resources_provider">resources_provider</a>, <a href="#resources_common.deduplicate-avoid_providers">avoid_providers</a>, <a href="#resources_common.deduplicate-field_handler">field_handler</a>)
+resources_common.deduplicate(<a href="#resources_common.deduplicate-resources_provider">resources_provider</a>, <a href="#resources_common.deduplicate-avoid_providers">avoid_providers</a>, <a href="#resources_common.deduplicate-field_handler">field_handler</a>, <a href="#resources_common.deduplicate-default_owner">default_owner</a>)
 </pre>
 
 
@@ -391,6 +391,7 @@ resources_common.deduplicate(<a href="#resources_common.deduplicate-resources_pr
 | <a id="resources_common.deduplicate-resources_provider"></a>resources_provider |  <p align="center"> - </p>   |  none |
 | <a id="resources_common.deduplicate-avoid_providers"></a>avoid_providers |  <p align="center"> - </p>   |  none |
 | <a id="resources_common.deduplicate-field_handler"></a>field_handler |  <p align="center"> - </p>   |  none |
+| <a id="resources_common.deduplicate-default_owner"></a>default_owner |  <p align="center"> - </p>   |  <code>None</code> |
 
 
 <a id="resources_common.merge_providers"></a>