Skip to content

Commit f8b14ce

Browse files
authored
Fix missing ownership (bazelbuild#1747)
1 parent c17af58 commit f8b14ce

3 files changed

Lines changed: 5 additions & 2 deletions

File tree

apple/internal/partials/resources.bzl

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -266,6 +266,7 @@ def _resources_partial_impl(
266266
infoplists.extend(result.infoplists)
267267

268268
resources.deduplicate(
269+
default_owner = str(rule_label),
269270
resources_provider = final_provider,
270271
avoid_providers = avoid_providers,
271272
field_handler = _deduplicated_field_handler,

apple/internal/resources.bzl

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -880,12 +880,13 @@ def _deduplicate_field(
880880

881881
return deduped_tuples
882882

883-
def _deduplicate(*, resources_provider, avoid_providers, field_handler):
883+
def _deduplicate(*, resources_provider, avoid_providers, field_handler, default_owner = None):
884884
avoid_provider = None
885885
if avoid_providers:
886886
# Call merge_providers with validate_all_resources_owned set, to ensure that all the
887887
# resources from dependency bundles have an owner.
888888
avoid_provider = _merge_providers(
889+
default_owner = default_owner,
889890
providers = avoid_providers,
890891
validate_all_resources_owned = True,
891892
)

doc/rules-resources.md

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,7 @@ A list with all the collected resources for the target represented by attr.
378378
## resources_common.deduplicate
379379

380380
<pre>
381-
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>)
381+
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>)
382382
</pre>
383383

384384

@@ -391,6 +391,7 @@ resources_common.deduplicate(<a href="#resources_common.deduplicate-resources_pr
391391
| <a id="resources_common.deduplicate-resources_provider"></a>resources_provider | <p align="center"> - </p> | none |
392392
| <a id="resources_common.deduplicate-avoid_providers"></a>avoid_providers | <p align="center"> - </p> | none |
393393
| <a id="resources_common.deduplicate-field_handler"></a>field_handler | <p align="center"> - </p> | none |
394+
| <a id="resources_common.deduplicate-default_owner"></a>default_owner | <p align="center"> - </p> | <code>None</code> |
394395

395396

396397
<a id="resources_common.merge_providers"></a>

0 commit comments

Comments
 (0)