1 files changed, 6 insertions, 1 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 2d91d75264..9ba7bb146a 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
@@ -62,6 +62,10 @@ public abstract class AbstractJ2ObjcProtoAspect extends NativeAspectClass
       new Attribute("$protobuf_lib", Mode.TARGET),
       new Attribute("deps", Mode.TARGET));
 
+  /** Flags passed to J2ObjC proto compiler plugin. */
+  protected static final Iterable<String> J2OBJC_PLUGIN_PARAMS =
+      ImmutableList.of("file_dir_mapping", "generate_class_mappings");
+
   protected final String toolsRepository;
 
   public AbstractJ2ObjcProtoAspect(String toolsRepository) {
@@ -81,7 +85,8 @@ public abstract class AbstractJ2ObjcProtoAspect extends NativeAspectClass
         .attributeAspect("exports", this)
         .attributeAspect("runtime_deps", this)
         .add(attr("$protobuf_lib", LABEL)
-            .value(Label.parseAbsoluteUnchecked("//third_party/java/j2objc:proto_runtime")))
+            .value(Label.parseAbsoluteUnchecked(
+                "//third_party/java/j2objc:proto_runtime_internal")))
         .add(attr("$xcrunwrapper", LABEL).cfg(HOST).exec()
             .value(Label.parseAbsoluteUnchecked(
                 toolsRepository + "//tools/objc:xcrunwrapper")))