2 files changed, 7 insertions, 3 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java
index 0c80f2779a..560051505f 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/AbstractJ2ObjcProtoAspect.java
@@ -132,7 +132,11 @@ public abstract class AbstractJ2ObjcProtoAspect extends NativeAspectClass
 
     // Avoid pulling in any generated files from blacklisted protos.
     ProtoSourceFileBlacklist protoBlacklist =
-        new ProtoSourceFileBlacklist(ruleContext, PROTO_SOURCE_FILE_BLACKLIST_ATTR);
+        new ProtoSourceFileBlacklist(
+            ruleContext,
+            ruleContext
+                .getPrerequisiteArtifacts(PROTO_SOURCE_FILE_BLACKLIST_ATTR, Mode.HOST)
+                .list());
     ImmutableList<Artifact> filteredProtoSources = ImmutableList.copyOf(
         protoBlacklist.filter(protoSources));
 
diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java
index 6b5c42101a..25f1469dbf 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/objc/ProtoAttributes.java
@@ -228,14 +228,14 @@ final class ProtoAttributes {
    */
   Iterable<Artifact> filterWellKnownProtos(Iterable<Artifact> protoFiles) {
     ProtoSourceFileBlacklist wellKnownProtoBlacklist =
-        new ProtoSourceFileBlacklist(ruleContext, ObjcRuleClasses.PROTOBUF_WELL_KNOWN_TYPES);
+        new ProtoSourceFileBlacklist(ruleContext, getWellKnownTypeProtos());
     return wellKnownProtoBlacklist.filter(protoFiles);
   }
 
   /** Returns whether the given proto is a well known proto or not. */
   boolean isProtoWellKnown(Artifact protoFile) {
     ProtoSourceFileBlacklist wellKnownProtoBlacklist =
-        new ProtoSourceFileBlacklist(ruleContext, ObjcRuleClasses.PROTOBUF_WELL_KNOWN_TYPES);
+        new ProtoSourceFileBlacklist(ruleContext, getWellKnownTypeProtos());
     return wellKnownProtoBlacklist.isBlacklisted(protoFile);
   }