Skip to content

Commit

Permalink
Migrate Objc compile info to CcCompilationContext
Browse files Browse the repository at this point in the history
Previous CL missed an include path.

Step 1 of 3-step plan:
1. Migrate the definitions.
2. Migrate the uses.
3. Delete old ObjcProvider definitions.

See bazelbuild/bazel#10674.

RELNOTES: None
PiperOrigin-RevId: 307730265
  • Loading branch information
googlewalt authored and swiple-rules-gardener committed Apr 22, 2020
1 parent 2ebfc40 commit 468ebe4
Showing 1 changed file with 4 additions and 1 deletion.
5 changes: 4 additions & 1 deletion swift/internal/swift_protoc_gen_aspect.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -441,13 +441,15 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
if linker_inputs:
objc_info_args["link_inputs"] = depset(linker_inputs)

includes = [aspect_ctx.bin_dir.path]
objc_info = apple_common.new_objc_provider(
include = depset([aspect_ctx.bin_dir.path]),
include = depset(includes),
providers = objc_infos,
uses_swift = True,
**objc_info_args
)
else:
includes = None
objc_info = None

providers = [
Expand All @@ -458,6 +460,7 @@ def _swift_protoc_gen_aspect_impl(target, aspect_ctx):
cc_info = create_cc_info(
cc_infos = cc_infos,
compilation_outputs = compilation_outputs,
includes = includes,
libraries_to_link = [library_to_link],
),
objc_info = objc_info,
Expand Down

0 comments on commit 468ebe4

Please sign in to comment.