commit 50d62ee7888856f935d09e5fd60ee23d24d02b44
author cushon <cushon@google.com> Tue Apr 18 01:20:04 2017 +0200
committer Klaus Aehlig <aehlig@google.com> Tue Apr 18 11:33:53 2017 +0200
tree dbe23ccd192464ff5790afb6599ebce1bca74bb7
parent 2eaa02e8b630ce94fff39422334c47726ead6324

Partial rollback of unknown commit

PiperOrigin-RevId: 153403092

src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java

diff --git a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
index 60aa028..12e97b8 100644
--- a/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
+++ b/src/main/java/com/google/devtools/build/lib/rules/java/JavaBinary.java
@@ -187,7 +187,10 @@
           semantics.translate(ruleContext, javaConfig, attributes.getMessages()));
     }
 
-    if (attributes.hasSources() || attributes.hasResources()) {
+    // TODO(b/37425618): this should be attributes.hasResources()
+    boolean hasResources =
+        !attributes.getResources().isEmpty() || !attributes.getClassPathResources().isEmpty();
+    if (attributes.hasSources() || hasResources) {
       // We only want to add a jar to the classpath of a dependent rule if it has content.
       javaArtifactsBuilder.addRuntimeJar(classJar);
     }