From 6f6093c6519e368eb1ed33fee6f8c6f1f8fd6fa1 Mon Sep 17 00:00:00 2001
From: Luis Padron <lpadron@squareup.com>
Date: Fri, 12 Jul 2024 23:33:59 -0400
Subject: [PATCH] Add `direct_public_headers` to CcInfo `compilation_context`

---
 rules/framework.bzl             | 5 +++++
 rules/framework/vfs_overlay.bzl | 1 +
 2 files changed, 6 insertions(+)

diff --git a/rules/framework.bzl b/rules/framework.bzl
index 2d744d11..ad708a38 100644
--- a/rules/framework.bzl
+++ b/rules/framework.bzl
@@ -1017,6 +1017,11 @@ def _apple_framework_packaging_impl(ctx):
     objc_provider_utils.add_to_dict_if_present(compilation_context_fields, "headers", depset(
         direct = outputs.headers + outputs.private_headers + outputs.modulemaps,
     ))
+    objc_provider_utils.add_to_dict_if_present(
+        compilation_context_fields,
+        "direct_public_headers",
+        outputs.headers + outputs.modulemaps,
+    )
     objc_provider_utils.add_to_dict_if_present(compilation_context_fields, "defines", depset(
         direct = [],
         transitive = [getattr(cc_info.compilation_context, "defines") for cc_info in dep_cc_infos],
diff --git a/rules/framework/vfs_overlay.bzl b/rules/framework/vfs_overlay.bzl
index b858d8bd..623a4236 100644
--- a/rules/framework/vfs_overlay.bzl
+++ b/rules/framework/vfs_overlay.bzl
@@ -283,6 +283,7 @@ def _framework_vfs_overlay_impl(ctx):
     cc_info = CcInfo(
         compilation_context = cc_common.create_compilation_context(
             headers = headers,
+            direct_public_headers = [vfs.vfsoverlay_file],
         ),
     )
     return [