1 files changed, 3 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
index e1537d07cd..810ce017de 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcLibrary.java
@@ -72,12 +72,13 @@ public class J2ObjcLibrary implements RuleConfiguredTargetFactory {
         .build();
 
     Iterable<ObjcProvider> jreDeps =
-        ruleContext.getPrerequisites("jre_deps", Mode.TARGET, ObjcProvider.class);
+        ruleContext.getPrerequisites("jre_deps", Mode.TARGET, ObjcProvider.SKYLARK_CONSTRUCTOR);
     ObjcProvider.Builder objcProviderBuilder =
         new ObjcProvider.Builder()
             .addTransitiveAndPropagate(jreDeps)
             .addTransitiveAndPropagate(
-                ruleContext.getPrerequisites("deps", Mode.TARGET, ObjcProvider.class));
+                ruleContext.getPrerequisites(
+                    "deps", Mode.TARGET, ObjcProvider.SKYLARK_CONSTRUCTOR));
     for (ObjcProvider prereq : jreDeps) {
       objcProviderBuilder.addTransitiveAndPropagate(JRE_LIBRARY, prereq.get(LIBRARY));
     }
@@ -109,7 +110,6 @@ public class J2ObjcLibrary implements RuleConfiguredTargetFactory {
         .add(RunfilesProvider.class, RunfilesProvider.EMPTY)
         .addProvider(J2ObjcEntryClassProvider.class, j2ObjcEntryClassProvider)
         .addProvider(J2ObjcMappingFileProvider.class, j2ObjcMappingFileProvider)
-        .addProvider(ObjcProvider.class, objcProvider)
         .addNativeDeclaredProvider(objcProvider)
         .build();
   }