1 files changed, 5 insertions, 2 deletions
diff --git a/src/main/java/com/android/tools/r8/utils/FileUtils.java b/src/main/java/com/android/tools/r8/utils/FileUtils.java
index 47a72a38a..16f41cc04 100644
--- a/src/main/java/com/android/tools/r8/utils/FileUtils.java
+++ b/src/main/java/com/android/tools/r8/utils/FileUtils.java
@@ -75,9 +75,12 @@ public class FileUtils {
 
   public static Path validateOutputFile(Path path) throws CompilationException {
     if (path != null) {
-      if (!isZipFile(path) && !(Files.exists(path) && Files.isDirectory(path))) {
+      boolean isJarOrZip = isZipFile(path) || isJarFile(path);
+      if (!isJarOrZip  && !(Files.exists(path) && Files.isDirectory(path))) {
         throw new CompilationException(
-            "Invalid output: " + path + "\nOutput must be a zip archive or an existing directory");
+            "Invalid output: "
+                + path +
+                "\nOutput must be a .zip or .jar archive or an existing directory");
       }
     }
     return path;