diff options
| author |  jmmv <jmmv@google.com> | 2018-05-21 13:04:16 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-21 13:05:51 -0700 |
| commit | b1ed9aa8b58aa5400e717e05f090599dad80feeb (patch) | |
| tree | bd1893cc0f51d5cf775aa8cb3ad0096a79a18992 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java | |
| parent | 88f0f85fe775db0aac223050d1454c99e3f9f80e (diff) | |
Automated rollback of commit 7a71ce816bc8a67a63c2d147ac953ac451ebd23b.
*** Reason for rollback ***
Targets in the repository are still able to depend on proto_library rules
even after the --noemit_proto_java_outputs flag flip. Removal of the Java
support from proto_library breaks them.
PiperOrigin-RevId: 197442659
Diffstat (limited to 'src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java')
| -rw-r--r-- | src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java index 0e59ce8367..4a4eab01e0 100644 --- a/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java +++ b/src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java @@ -106,6 +106,10 @@ public class JavaProtoAspect extends NativeAspectClass implements ConfiguredAspe JavaProtoAspectCommon aspectCommon = JavaProtoAspectCommon.getSpeedInstance(ruleContext, javaSemantics, rpcSupport); Impl impl = new Impl(ruleContext, supportData, aspectCommon, rpcSupport); + if (impl.shouldGenerateCode() + && ActionReuser.reuseExistingActions(ctadBase.getConfiguredTarget(), ruleContext, aspect)) { + return aspect.build(); + } impl.addProviders(aspect); return aspect.build(); } |