Rollforward #2 of "AppleBinary and AppleStaticLibrary no longer propagate unwrapped ObjcProvider", after changes made to apple bazel rules to be compatible.

RELNOTES: None.
PiperOrigin-RevId: 167061765

1 files changed, 9 insertions, 4 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
index 043f21b8cb..ca872738ca 100644
--- a/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
+++ b/src/test/java/com/google/devtools/build/lib/rules/objc/ObjcProtoLibraryTest.java
@@ -679,12 +679,12 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
 
   @Test
   public void testModulemapCreatedForNonLinkingTargets() throws Exception {
-    checkOnlyLibModuleMapsArePresentForTarget("//package:opl_protobuf");
+    checkOnlyLibModuleMapsArePresentForTarget("//package:opl_protobuf", false);
   }
 
   @Test
   public void testModulemapNotCreatedForLinkingTargets() throws Exception {
-    checkOnlyLibModuleMapsArePresentForTarget("//package:opl_binary");
+    checkOnlyLibModuleMapsArePresentForTarget("//package:opl_binary", true);
   }
 
   @Test
@@ -760,7 +760,8 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
     return Joiner.on('\n').join(Ordering.natural().immutableSortedCopy(elements));
   }
 
-  private void checkOnlyLibModuleMapsArePresentForTarget(String target) throws Exception {
+  private void checkOnlyLibModuleMapsArePresentForTarget(String target,
+      boolean fromBinary) throws Exception {
     Artifact libModuleMap =
         getGenfilesArtifact(
             "opl_protobuf.modulemaps/module.modulemap",
@@ -770,7 +771,11 @@ public class ObjcProtoLibraryTest extends ObjcRuleTestCase {
             "protobuf_lib.modulemaps/module.modulemap",
             getConfiguredTarget("//objcproto:protobuf_lib"));
 
-    ObjcProvider provider = providerForTarget(target);
+    ObjcProvider provider = fromBinary
+        ? getConfiguredTarget(target)
+              .get(AppleExecutableBinaryProvider.SKYLARK_CONSTRUCTOR)
+              .getDepsObjcProvider()
+        : providerForTarget(target);
     assertThat(Artifact.toRootRelativePaths(provider.get(ObjcProvider.MODULE_MAP).toSet()))
         .containsExactlyElementsIn(
             Artifact.toRootRelativePaths(ImmutableSet.of(libModuleMap, protolibModuleMap)));