commit c3c25dc3754193b413a6dc11032f1fdb86e0500e
author Irina Iancu <elenairina@google.com> Mon Mar 06 09:29:32 2017 +0000
committer Yue Gan <yueg@google.com> Mon Mar 06 09:47:53 2017 +0000
tree 608b6ebcb30e3412073d267bec28b9fb561c18a3
parent 280cac15ef711f4a1aae1b2b1417649d7e816f49

Add flavour name for java proto compilation.

--
PiperOrigin-RevId: 149274808
MOS_MIGRATED_REVID=149274808

src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java
index 8cb64b0..a2b077e 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoSkylarkCommon.java
@@ -57,6 +57,13 @@
               positional = false,
               named = true,
               type = String.class
+          ),
+          @Param(
+              name = "flavour",
+              positional = false,
+              named = true,
+              type = String.class,
+              defaultValue = "java"
           )
       }
   )
@@ -64,14 +71,15 @@
       SkylarkRuleContext skylarkRuleContext,
       ConfiguredTarget target,
       Artifact sourceJar,
-      String protoToolchainAttr) {
+      String protoToolchainAttr,
+      String flavour) {
     SupportData supportData =
         checkNotNull(target.getProvider(ProtoSupportDataProvider.class).getSupportData());
     ProtoCompileActionBuilder.registerActions(
         skylarkRuleContext.getRuleContext(),
         ImmutableList.of(
             new ProtoCompileActionBuilder.ToolchainInvocation(
-                "javalite",
+                flavour,
                 getProtoToolchainProvider(skylarkRuleContext, protoToolchainAttr),
                 sourceJar.getExecPathString())),
         supportData.getDirectProtoSources(),