Don't bundle the umbrella header if there is only one public header

which already has the same name
bazelbuild · May 10, 2019 · ef393ce · ef393ce
1 parent 3808adf
commit ef393ce
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/apple/internal/partials/static_framework_header_modulemap.bzl b/apple/internal/partials/static_framework_header_modulemap.bzl
@@ -131,9 +131,16 @@ def _static_framework_header_modulemap_partial_impl(ctx, hdrs, binary_objc_provi
             sorted(hdrs),
         )
 
-        bundle_files.append(
-            (processor.location.bundle, "Headers", depset(hdrs + [umbrella_header_file])),
-        )
+        # Don't bundle the umbrella header if there is only one public header
+        # which has the same name
+        if len(hdrs) == 1 and hdrs[0].basename == umbrella_header_name:
+            bundle_files.append(
+                (processor.location.bundle, "Headers", depset(hdrs)),
+            )
+        else:
+            bundle_files.append(
+                (processor.location.bundle, "Headers", depset(hdrs + [umbrella_header_file])),
+            )
     else:
         umbrella_header_name = None