Pass read and hold libraries path to link for targets

Author: Karim Alweheshy

tools/generators/pbxnativetargets/src/Generator/Target.swift

@@ -34,6 +34,7 @@ enum Target {
         let unitTestHost: UnitTestHost?
         let dSYMPathsBuildSetting: String?
         let librarySearchPaths: Set<BazelPath>
+        let librariesToLinkPaths: Set<BazelPath>
     }
 
     struct UnitTestHost: Equatable {

tools/generators/pbxnativetargets/src/Generator/TargetArguments.swift

@@ -30,6 +30,7 @@ struct TargetArguments: Equatable {
 
     let dSYMPathsBuildSetting: String
     let librarySearchPaths: [BazelPath]
+    let librariesToLinkPaths: [BazelPath]
 }
 
 extension Dictionary<TargetID, TargetArguments> {
@@ -98,6 +99,11 @@ extension Dictionary<TargetID, TargetArguments> {
                 as: BazelPath.self,
                 in: url
             )
+            let librariesToLinkPaths = try rawArgs.consumeArgs(
+                "libraries_to_link_paths",
+                as: BazelPath.self,
+                in: url
+            )
 
             var buildSettings: [PlatformVariantBuildSetting] = []
             if let buildSettingsFile {
@@ -137,7 +143,8 @@ extension Dictionary<TargetID, TargetArguments> {
                         srcs: srcs,
                         nonArcSrcs: nonArcSrcs,
                         dSYMPathsBuildSetting: dSYMPathsBuildSetting,
-                        librarySearchPaths: librarySearchPaths
+                        librarySearchPaths: librarySearchPaths,
+                        librariesToLinkPaths: librariesToLinkPaths
                     )
                 )
             )

xcodeproj/internal/files/linker_input_files.bzl

@@ -80,18 +80,27 @@ def _collect_linker_inputs(
         for lib in libraries
     ])
 
+    framework_files = depset([
+        lib.basename
+        for lib in libraries
+    ])
+
     return struct(
         _cc_linker_inputs = tuple(cc_linker_inputs),
         _compilation_providers = compilation_providers,
         _objc_libraries = tuple(objc_libraries),
         _primary_static_library = primary_static_library,
         _top_level_values = top_level_values,
         _linker_inputs_for_libs_search_paths = linker_inputs_for_libs_search_paths,
+        _framework_files = framework_files,
     )
 
 def _get_linker_inputs_for_libs_search_paths(linker_inputs):
     return linker_inputs._linker_inputs_for_libs_search_paths
 
+def _get_libraries_path_to_link(linker_inputs):
+    return linker_inputs._framework_files
+
 def _merge_linker_inputs(*, compilation_providers):
     return _collect_linker_inputs(
         target = None,
@@ -408,4 +417,5 @@ linker_input_files = struct(
     ),
     to_input_files = _to_input_files,
     get_linker_inputs_for_libs_search_paths = _get_linker_inputs_for_libs_search_paths,
+    get_libraries_path_to_link = _get_libraries_path_to_link,
 )

xcodeproj/internal/incremental_xcode_targets.bzl

@@ -84,7 +84,8 @@ def _make_incremental_xcode_target(
         transitive_dependencies,
         unfocus_if_not_test_host = False,
         watchkit_extension = None,
-        linker_inputs_for_libs_search_paths):
+        linker_inputs_for_libs_search_paths,
+        libraries_path_to_link):
     """Creates the internal data structure of the `xcode_targets` module.
 
     Args:
@@ -122,6 +123,8 @@ def _make_incremental_xcode_target(
             or `None`.
         linker_inputs_for_libs_search_paths: Used to generated the
             `LIBRARY_SEARCH_PATHS` build setting.
+        libraries_path_to_link: A depset of libraries paths to link to the
+            target.
     """
     if not is_top_level:
         compile_stub_needed = False
@@ -171,6 +174,7 @@ def _make_incremental_xcode_target(
         watchkit_extension = watchkit_extension,
         transitive_dependencies = transitive_dependencies,
         linker_inputs_for_libs_search_paths = linker_inputs_for_libs_search_paths,
+        libraries_path_to_link = libraries_path_to_link,
     )
 
 def _merge_xcode_inputs(*, dest_inputs, mergeable_info):

xcodeproj/internal/pbxproj_partials.bzl

@@ -322,6 +322,12 @@ def _write_consolidation_map_targets(
                 terminate_with = "",
             )
 
+            targets_args.add_all(
+                xcode_target.libraries_path_to_link.to_list(),
+                omit_if_empty = False,
+                terminate_with = "",
+            )
+
             # `outputs.product_path` is only set for top-level targets
             if xcode_target.outputs.product_path:
                 top_level_targets_args.add(xcode_target.id)

xcodeproj/internal/processed_targets/incremental_library_targets.bzl

@@ -233,6 +233,8 @@ def _process_incremental_library_target(
             transitive_dependencies = transitive_dependencies,
             linker_inputs_for_libs_search_paths = linker_input_files
                 .get_linker_inputs_for_libs_search_paths(linker_inputs),
+            libraries_path_to_link = linker_input_files
+                .get_libraries_path_to_link(linker_inputs),
         )
     else:
         mergeable_infos = depset(

xcodeproj/internal/processed_targets/incremental_top_level_targets.bzl

@@ -630,6 +630,8 @@ def _process_focused_top_level_target(
             watchkit_extension = watchkit_extension,
             linker_inputs_for_libs_search_paths = linker_input_files
                 .get_linker_inputs_for_libs_search_paths(linker_inputs),
+            libraries_path_to_link = linker_input_files
+                .get_libraries_path_to_link(linker_inputs),
         ),
     )
 

xcodeproj/internal/processed_targets/mixed_language_library_targets.bzl

@@ -216,6 +216,8 @@ def _process_mixed_language_library_target(
             transitive_dependencies = transitive_dependencies,
             linker_inputs_for_libs_search_paths = linker_input_files
                 .get_linker_inputs_for_libs_search_paths(linker_inputs),
+            libraries_path_to_link = linker_input_files
+                .get_libraries_path_to_link(linker_inputs),
         )
     else:
         mergeable_infos = depset(