Make it easier to use protos in Bazel out of the box.

java_xxx_proto_library rules now look for toolchains in the external repo @com_google_protobuf_xxx//:xxx_toolchain

This still requires getting protobuf's GitHub repository to build with Bazel.

--
MOS_MIGRATED_REVID=140420903

1 files changed, 17 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
index 7ae7cadd19..e8fa34660a 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaLiteProtoAspect.java
@@ -66,22 +66,29 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured
 
   public static final String PROTO_TOOLCHAIN_ATTR = ":aspect_proto_toolchain_for_javalite";
 
-  public static final Attribute.LateBoundLabel<BuildConfiguration> PROTO_TOOLCHAIN_LABEL =
-      new Attribute.LateBoundLabel<BuildConfiguration>(
-          "//tools/proto/toolchains:javalite", ProtoConfiguration.class) {
-        @Override
-        public Label resolve(Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
-          return configuration.getFragment(ProtoConfiguration.class).protoToolchainForJavaLite();
-        }
-      };
+  public static Attribute.LateBoundLabel<BuildConfiguration> getProtoToolchainLabel(
+      String defaultValue) {
+    return new Attribute.LateBoundLabel<BuildConfiguration>(
+        defaultValue, ProtoConfiguration.class) {
+      @Override
+      public Label resolve(Rule rule, AttributeMap attributes, BuildConfiguration configuration) {
+        return configuration.getFragment(ProtoConfiguration.class).protoToolchainForJavaLite();
+      }
+    };
+  }
 
   private final JavaSemantics javaSemantics;
 
   @Nullable private final String jacocoLabel;
+  private final String defaultProtoToolchainLabel;
 
-  public JavaLiteProtoAspect(JavaSemantics javaSemantics, @Nullable String jacocoLabel) {
+  public JavaLiteProtoAspect(
+      JavaSemantics javaSemantics,
+      @Nullable String jacocoLabel,
+      String defaultProtoToolchainLabel) {
     this.javaSemantics = javaSemantics;
     this.jacocoLabel = jacocoLabel;
+    this.defaultProtoToolchainLabel = defaultProtoToolchainLabel;
   }
 
   @Override
@@ -112,7 +119,7 @@ public class JavaLiteProtoAspect extends NativeAspectClass implements Configured
                     .mandatoryNativeProviders(
                         ImmutableList.<Class<? extends TransitiveInfoProvider>>of(
                             ProtoLangToolchainProvider.class))
-                    .value(PROTO_TOOLCHAIN_LABEL))
+                    .value(getProtoToolchainLabel(defaultProtoToolchainLabel)))
             .add(attr(":host_jdk", LABEL).cfg(HOST).value(JavaSemantics.HOST_JDK))
             .add(
                 attr(":java_toolchain", LABEL)