Skip to content

Commit

Permalink
Get Objc compile info from CcCompilationContext
Browse files Browse the repository at this point in the history
Note strict includes still come from ObjcProvider.

Step 2 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: 296338258
  • Loading branch information
googlewalt authored and swiple-rules-gardener committed Apr 22, 2020
1 parent 2c24d05 commit a0a2a8e
Showing 1 changed file with 5 additions and 1 deletion.
6 changes: 5 additions & 1 deletion apple/internal/testing/apple_test_bundle_support.bzl
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,16 @@ def _apple_test_info_aspect_impl(target, ctx):

if apple_common.Objc in target:
objc_provider = target[apple_common.Objc]
includes.append(objc_provider.include)
includes.append(objc_provider.strict_include)

# Module maps should only be used by Swift targets.
if SwiftInfo in target:
module_maps.append(objc_provider.module_map)

if CcInfo in target:
cc_info = target[CcInfo]
includes.append(cc_info.compilation_context.includes)

if (SwiftInfo in target and
hasattr(target[SwiftInfo], "transitive_swiftmodules")):
swift_modules.append(target[SwiftInfo].transitive_swiftmodules)
Expand Down

0 comments on commit a0a2a8e

Please sign in to comment.