diff options
| author |  tomlu <tomlu@google.com> | 2018-05-23 08:02:04 -0700 |
|---|---|---|
| committer |  Copybara-Service <copybara-piper@google.com> | 2018-05-23 08:03:54 -0700 |
| commit | b8c51205bfd91fdeb98f7879bda05f0c53b58e0b (patch) | |
| tree | 0cbd362d968816023079020b8c9f07eabe7030a7 /src/main/java/com/google/devtools/build/lib/rules/java/proto/JavaProtoAspect.java | |
| parent | 24be509e3a40a0ac661edaf825f6dcd5d9a94d47 (diff) | |
Rollforward of CL/197136304:
Remove java support from proto_library.
NEW: Allow java_* rules to depend on proto_libraries via runtime_deps and exports. This should avoid the breakage that caused the original rollback. The edges are no-ops and could be removed.
*** 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: 197725926
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, 0 insertions, 4 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 4a4eab01e0..0e59ce8367 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,10 +106,6 @@ 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(); } |