Add better diagnostics for missing Java files. am: dea851f1ec am: 71457422ec am: e9060b64f6 am: 6386bb2832 am: 58b8245491

Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2546371

Change-Id: Ic157fa76728bf646fa6777e0bb6b62662b6a003a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/src/vogar/tasks/BuildActionTask.java b/src/vogar/tasks/BuildActionTask.java
index fd4c43a..04605fd 100644
--- a/src/vogar/tasks/BuildActionTask.java
+++ b/src/vogar/tasks/BuildActionTask.java
@@ -17,6 +17,7 @@
 package vogar.tasks;
 
 import java.io.File;
+import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.IOException;
 import java.io.OutputStream;
@@ -90,7 +91,14 @@ public final class BuildActionTask extends Task {
         if (run.debugging) {
             javac.debug();
         }
-        if (javaFile != null) {
+        if (javaFile == null) {
+            if (JAVA_SOURCE_PATTERN.matcher(action.getTargetClass()).find()) {
+                // This is likely a missing source file rather than a class
+                // named something.java....
+                throw new FileNotFoundException("Unlikely classname, assuming missing source file: "
+                    + action.getTargetClass());
+            }
+        } else {
             if (!JAVA_SOURCE_PATTERN.matcher(javaFile.toString()).find()) {
                 throw new CommandFailedException(Collections.<String>emptyList(),
                         Collections.singletonList("Cannot compile: " + javaFile));