From 78360b4f2f0a7801c4074b8dcdcf6367d17f2f22 Mon Sep 17 00:00:00 2001
From: Brentley Jones <github@brentleyjones.com>
Date: Thu, 21 Jul 2022 14:13:29 -0500
Subject: [PATCH] Calculate `ExtensionPointIdentifier` without compiling
 XCAssets

Using the Bazel generated Info.plist to calculate `ExtensionPointIdentifier` adds an implicit dependency on `AssetCatalogCompile`. We only need to "merge" the hand provided Info.plists, which we do by processing multiple Info.plists for a target, in order.
---
 .../extensionpointidentifiers_parser.py       | 23 +++++++++----------
 xcodeproj/internal/top_level_targets.bzl      | 22 +++++++++++-------
 2 files changed, 25 insertions(+), 20 deletions(-)

diff --git a/tools/extensionpointidentifiers_parser/extensionpointidentifiers_parser.py b/tools/extensionpointidentifiers_parser/extensionpointidentifiers_parser.py
index 70bc649ff2..1c25c99e72 100755
--- a/tools/extensionpointidentifiers_parser/extensionpointidentifiers_parser.py
+++ b/tools/extensionpointidentifiers_parser/extensionpointidentifiers_parser.py
@@ -1,5 +1,6 @@
-#/usr/bin/python3
+#!/usr/bin/python3
 
+from collections import OrderedDict
 import plistlib
 import sys
 
@@ -18,9 +19,9 @@ def _main(
 ERROR: number of target ids doesn't match the number of Info.plist files""",
             file = sys.stderr,
         )
-        exit(1)
+        sys.exit(1)
 
-    results = []
+    results = OrderedDict()
     for targetid, path in zip(targetids, paths):
         with open(path, 'rb') as fp:
             plist = plistlib.load(fp)
@@ -29,18 +30,16 @@ def _main(
             plist.get("NSExtension", {}).get("NSExtensionPointIdentifier")
         )
         if not extension_point_identifier:
-            print(
-                f"""
-WARNING: `NSExtension.NSExtensionPointIdentifier` key not found in {path}
-""",
-                file = sys.stderr,
-            )
             continue
 
-        results.append(f'"{targetid}","{extension_point_identifier}"')
+        results[targetid] = extension_point_identifier
 
     with open(output_path, encoding = "utf-8", mode = "w") as fp:
-        fp.write(f'[{",".join(results)}]\n')
+        results_json = [
+            f'"{targetid}","{extension_point_identifier}"'
+            for targetid, extension_point_identifier in results.items()
+        ]
+        fp.write(f'[{",".join(results_json)}]\n')
 
 
 if __name__ == "__main__":
@@ -52,6 +51,6 @@ def _main(
 """,
             file = sys.stderr,
         )
-        exit(1)
+        sys.exit(1)
 
     _main(sys.argv[1], sys.argv[2], sys.argv[3])
diff --git a/xcodeproj/internal/top_level_targets.bzl b/xcodeproj/internal/top_level_targets.bzl
index c3564542f4..8ec99c0f39 100644
--- a/xcodeproj/internal/top_level_targets.bzl
+++ b/xcodeproj/internal/top_level_targets.bzl
@@ -234,16 +234,22 @@ def process_top_level_target(
         info_plists.get_file(target),
         ctx = ctx,
     )
-    extension_infoplists = None
     if infoplist:
         additional_files.append(infoplist)
-        if bundle_info and bundle_info.bundle_extension == ".appex":
-            extension_infoplists = [
-                struct(
-                    id = id,
-                    infoplist = infoplist,
-                ),
-            ]
+
+    infoplists_attrs = automatic_target_info.infoplists
+    if (infoplists_attrs and bundle_info and
+        bundle_info.bundle_extension == ".appex"):
+        extension_infoplists = [
+            struct(
+                id = id,
+                infoplist = infoplist,
+            )
+            for attr in infoplists_attrs
+            for infoplist in getattr(ctx.rule.files, attr, [])
+        ]
+    else:
+        extension_infoplists = None
 
     provisioning_profiles.process_attr(
         ctx = ctx,