Correct issues around "bundle_zips", add an analysis time check to ensure more do not slip through in rules processing.

Cherry-pick: b8e1152

Author: nglevin

apple/internal/partials/macos_additional_contents.bzl

@@ -46,13 +46,26 @@ def _macos_additional_contents_partial_impl(*, additional_contents):
     bundle_zips = []
     for target, subdirectory in additional_contents.items():
         if AppleBundleInfo in target:
-            bundle_zips.append(
-                (
-                    processor.location.content,
-                    subdirectory,
-                    depset([target[AppleBundleInfo].archive]),
-                ),
-            )
+            target_archive = target[AppleBundleInfo].archive
+            if (target_archive.short_path.endswith(".zip") or
+                target_archive.short_path.endswith(".ipa")):
+                # Zipped archive case.
+                bundle_zips.append(
+                    (
+                        processor.location.content,
+                        subdirectory,
+                        depset([target_archive]),
+                    ),
+                )
+            else:
+                # Tree artifact archive case.
+                bundle_files.append(
+                    (
+                        processor.location.content,
+                        subdirectory,
+                        depset([target_archive]),
+                    ),
+                )
         elif AppleBinaryInfo in target:
             bundle_files.append(
                 (

apple/internal/processor.bzl

@@ -369,8 +369,19 @@ def _bundle_partial_outputs_files(
             input_files.extend(sources)
 
             for source in sources:
+                source_path = source.path
+                if not source_path.endswith(".zip") and not source_path.endswith(".ipa"):
+                    fail("""
+Internal Error: Found a file declared by the Apple rules as a "bundle zip" that is not a zip file: \
+{source_path}
+
+This indicates that there is a severe bug in how rules_apple handles the processing of these files.
+
+Please file a bug against the Apple BUILD rules with repro steps.
+""".format(source_path = source_path))
+
                 target_path = paths.join(location_to_paths[location], parent_dir or "")
-                control_zips.append(struct(src = source.path, dest = target_path))
+                control_zips.append(struct(src = source_path, dest = target_path))
 
     post_processor = ipa_post_processor
     post_processor_path = ""

apple/internal/resources.bzl

@@ -243,9 +243,10 @@ def _bucketize_data(
 
             # For each type of resource, place in the appropriate bucket.
             if AppleFrameworkBundleInfo in target:
-                if "framework.dSYM/" in resource_short_path or resource.extension == "linkmap":
-                    # Ignore dSYM bundle and linkmap since the debug symbols partial is
-                    # responsible for propagating this up the dependency graph.
+                if ".dSYM" in resource_short_path or resource.extension == "linkmap":
+                    # Never ever bundle dSYMs or linkmaps since they should never, ever belong in
+                    # resource processing. This goes for any "framework" outputs that do not belong
+                    # in the shipping framework bundle itself.
                     continue
                 bucket_name = "framework"
             elif resource_short_path.endswith(".strings") or resource_short_path.endswith(".stringsdict"):