Support frameworks in cxx_library for apple_library swap

Summary:
Move framework search path preprocessor creation from apple_library and apple_binary into cxx_library_parameterized and cxx_executable respectively. This eliminates duplication when apple_library calls cxx_library_parameterized (or apple_binary calls cxx_executable), and enables cxx_library/cxx_binary/cxx_test to properly handle the frameworks attribute when used as replacements for apple rules in fb_xplat_cxx_library.

Changes:
- cxx_library.bzl: Add framework search path flags (-F) to both own_preprocessors and own_exported_preprocessors when frameworks attribute is set
- cxx_executable.bzl: Add framework search path flags to own_preprocessors for cxx_binary/cxx_test support
- apple_library.bzl: Remove duplicate framework_search_path_pre creation (now handled by cxx_library_parameterized)
- apple_binary.bzl: Remove duplicate framework_search_path_pre creation (now handled by cxx_executable)
- Add integration tests: build tests for apple_library, cxx_library, and cxx_binary with frameworks; compilation database test verifying -F flags are present and not duplicated

This unblocks D90707637 which swaps apple_library -> cxx_library in fb_xplat_cxx_library.

Reviewed By: milend

Differential Revision: D91696908

fbshipit-source-id: b938cf1a3a2e203cac5b45efd76fa486da84cd2e

Author: mzlee

prelude/apple/apple_binary.bzl

@@ -60,11 +60,6 @@ load(
     "get_link_group_info",
 )
 load("@prelude//cxx:link_types.bzl", "ExtraLinkerOutputCategory")
-load(
-    "@prelude//cxx:preprocessor.bzl",
-    "CPreprocessor",
-    "CPreprocessorArgs",
-)
 load(
     "@prelude//linking:link_info.bzl",
     "CxxSanitizerRuntimeInfo",
@@ -129,10 +124,6 @@ def apple_binary_impl(ctx: AnalysisContext) -> [list[Provider], Promise]:
             ]
             extension_compiler_flags = ["-fapplication-extension"]
 
-        framework_search_path_pre = CPreprocessor(
-            args = CPreprocessorArgs(args = [framework_search_path_flags]),
-        )
-
         swift_dependency_info = swift_compile.dependency_info if swift_compile else get_swift_dependency_info(ctx, None, deps_providers, False)
         swift_debug_info = get_swift_debug_infos(
             ctx,
@@ -174,7 +165,7 @@ def apple_binary_impl(ctx: AnalysisContext) -> [list[Provider], Promise]:
             ),
             extra_link_input = swift_object_files,
             extra_link_input_has_external_debug_info = True,
-            extra_preprocessors = [framework_search_path_pre] + swift_preprocessor,
+            extra_preprocessors = swift_preprocessor,
             strip_executable = stripped,
             strip_args_factory = apple_strip_args,
             cxx_populate_xcode_attributes_func = lambda local_ctx, **kwargs: apple_populate_xcode_attributes(local_ctx, contains_swift_sources = contains_swift_sources, **kwargs),

prelude/apple/apple_library.bzl

@@ -90,7 +90,6 @@ load(
 load(
     "@prelude//cxx:preprocessor.bzl",
     "CPreprocessor",
-    "CPreprocessorArgs",
     "CPreprocessorInfo",  # @unused Used as a type
 )
 load("@prelude//cxx:target_sdk_version.bzl", "get_unversioned_target_triple")
@@ -445,10 +444,6 @@ def apple_library_rule_constructor_params_and_swift_providers(ctx: AnalysisConte
 
         return providers
 
-    framework_search_path_pre = CPreprocessor(
-        args = CPreprocessorArgs(args = [framework_search_paths_flags]),
-    )
-
     validation_deps_outputs = get_validation_deps_outputs(ctx)
     if swift_compile:
         swift_objc_header = swift_compile.exported_swift_header
@@ -528,7 +523,7 @@ def apple_library_rule_constructor_params_and_swift_providers(ctx: AnalysisConte
         extra_link_input = swift_object_files,
         extra_link_input_has_external_debug_info = True,
         extra_preprocessors = [swift_pre, modular_pre],
-        extra_exported_preprocessors = filter(None, [framework_search_path_pre, exported_pre]),
+        extra_exported_preprocessors = filter(None, [exported_pre]),
         srcs = cxx_srcs,
         additional = CxxRuleAdditionalParams(
             srcs = swift_srcs,

prelude/cxx/cxx_executable.bzl

@@ -25,6 +25,7 @@ load(
     "apple_build_link_args_with_deduped_flags",
     "apple_create_frameworks_linkable",
     "apple_get_link_info_by_deduping_link_infos",
+    "get_framework_search_path_flags",
 )
 load(
     "@prelude//cxx:cxx_bolt.bzl",
@@ -196,6 +197,8 @@ load(
 )
 load(
     ":preprocessor.bzl",
+    "CPreprocessor",
+    "CPreprocessorArgs",
     "cxx_inherited_preprocessor_infos",
     "cxx_private_preprocessor_info",
 )
@@ -247,19 +250,32 @@ def cxx_executable(ctx: AnalysisContext, impl_params: CxxRuleConstructorParams,
     )
     inherited_preprocessor_infos = cxx_inherited_preprocessor_infos(preprocessor_deps) + impl_params.extra_preprocessors_info
 
+    # Add framework search paths if frameworks attribute is set.
+    # This is needed for the apple_test/apple_binary -> cxx_test/cxx_binary swap.
+    frameworks = getattr(ctx.attrs, "frameworks", [])
+    framework_search_path_pre = None
+    if frameworks:
+        framework_search_paths_flags = get_framework_search_path_flags(ctx)
+        framework_search_path_pre = CPreprocessor(
+            args = CPreprocessorArgs(args = [framework_search_paths_flags]),
+        )
+
     # The link style to use.
     link_strategy = to_link_strategy(cxx_attr_link_style(ctx))
     link_strategy = process_link_strategy_for_pic_behavior(link_strategy, get_cxx_toolchain_info(ctx).pic_behavior)
 
     sub_targets = {}
 
     # Compile objects.
+    own_preprocessors = [own_preprocessor_info] + test_preprocessor_infos
+    if framework_search_path_pre:
+        own_preprocessors.insert(0, framework_search_path_pre)
     compile_cmd_output = create_compile_cmds(
         ctx.actions,
         ctx.label,
         get_cxx_toolchain_info(ctx),
         impl_params,
-        [own_preprocessor_info] + test_preprocessor_infos,
+        own_preprocessors,
         inherited_preprocessor_infos,
         is_coverage_enabled_by_any_dep(ctx, preprocessor_deps),
     )

prelude/cxx/cxx_library.bzl

@@ -27,6 +27,7 @@ load(
     "apple_build_link_args_with_deduped_flags",
     "apple_create_frameworks_linkable",
     "apple_get_link_info_by_deduping_link_infos",
+    "get_framework_search_path_flags",
 )
 load(
     "@prelude//apple:apple_resource_types.bzl",
@@ -233,6 +234,7 @@ load(
 load(
     ":preprocessor.bzl",
     "CPreprocessor",  # @unused Used as a type
+    "CPreprocessorArgs",
     "CPreprocessorForTestsInfo",
     "CPreprocessorInfo",  # @unused Used as a type
     "cxx_exported_preprocessor_info",
@@ -467,6 +469,17 @@ def cxx_library_parameterized(ctx: AnalysisContext, impl_params: CxxRuleConstruc
     own_preprocessors = [own_non_exported_preprocessor_info, own_exported_preprocessor_info] + test_preprocessor_infos
     own_exported_preprocessors = [own_exported_preprocessor_info]
 
+    # Add framework search paths to exported preprocessors if frameworks attribute is set.
+    # This is needed for the apple_library -> cxx_library swap in fb_xplat_cxx_library.
+    frameworks = getattr(ctx.attrs, "frameworks", [])
+    if frameworks:
+        framework_search_paths_flags = get_framework_search_path_flags(ctx)
+        framework_search_path_pre = CPreprocessor(
+            args = CPreprocessorArgs(args = [framework_search_paths_flags]),
+        )
+        own_exported_preprocessors.insert(0, framework_search_path_pre)
+        own_preprocessors.insert(0, framework_search_path_pre)
+
     inherited_non_exported_preprocessor_infos = cxx_inherited_preprocessor_infos(
         # Legacy precompiled_header implementation is not exported. Proper precompiled headers can have exported linkables.
         non_exported_deps + filter(None, [impl_params.precompiled_header if impl_params.precompiled_header and not impl_params.precompiled_header[CPrecompiledHeaderInfo].compiled else None]),