diff options
author | Pete Bentley <prb@google.com> | 2023-04-20 12:37:53 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2023-04-20 12:37:53 +0000 |
commit | e9060b64f6027bd74e226fb07f7fd2cf5c9d1c31 (patch) | |
tree | bf1239f221f4c8aab5d33153d9dcff6f142ba90f | |
parent | c5ebc92e4e5354464b861e7646418acebb618a43 (diff) | |
parent | 71457422ecc0882c267838d8cd98cc7f7f7b2af4 (diff) | |
download | vogar-e9060b64f6027bd74e226fb07f7fd2cf5c9d1c31.tar.gz |
Add better diagnostics for missing Java files. am: dea851f1ec am: 71457422ec
Original change: https://android-review.googlesource.com/c/platform/external/vogar/+/2546371
Change-Id: Ic127d12aa0867c91c9aa58cb4a38afbc43b99374
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
-rw-r--r-- | src/vogar/tasks/BuildActionTask.java | 10 |
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)); |