commit 50c262537a7418580939e0f8eb50024cbcbb2b4d
author Morten Krogh-Jespersen <mkroghj@google.com> Mon Oct 12 12:29:41 2020 +0200
committer Morten Krogh-Jespersen <mkroghj@google.com> Mon Oct 12 12:02:50 2020 +0000
tree f50cc25f1ab1a876cad0372b17eb82a481b3e742
parent a93b8ab9124c9061db7dc1de6ced327d78faddba

[Retrace] Print usage on errors and version on help

Bug: 169552039
Change-Id: I580f891eebb2bdfc945b4240ace353014ff5727a

src/main/java/com/android/tools/r8/retrace/Retrace.java

diff --git a/src/main/java/com/android/tools/r8/retrace/Retrace.java b/src/main/java/com/android/tools/r8/retrace/Retrace.java
index d595892..bbc053a 100644
--- a/src/main/java/com/android/tools/r8/retrace/Retrace.java
+++ b/src/main/java/com/android/tools/r8/retrace/Retrace.java
@@ -216,6 +216,7 @@
         return;
       }
       assert Arrays.asList(mappedArgs).contains("--help");
+      System.out.println("Retrace " + Version.getVersionString());
       System.out.print(USAGE_MESSAGE);
       return;
     }
@@ -262,9 +263,11 @@
       action.run();
     } catch (RetraceAbortException e) {
       // Detail of the errors were already reported
+      System.err.println(StringUtils.LINE_SEPARATOR + USAGE_MESSAGE + StringUtils.LINE_SEPARATOR);
       System.exit(STATUS_ERROR);
     } catch (RuntimeException e) {
       System.err.println("Retrace failed with an internal error.");
+      System.err.println(StringUtils.LINE_SEPARATOR + USAGE_MESSAGE + StringUtils.LINE_SEPARATOR);
       Throwable cause = e.getCause() == null ? e : e.getCause();
       cause.printStackTrace();
       System.exit(STATUS_ERROR);