commit 3f99ae761be27337dcca7b00098b01680499a667
author Ivan Gavrilovic <gavra@google.com> Fri Feb 08 14:07:52 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Feb 08 14:07:52 2019 +0000
tree 731de336c0420363c647f1c7b9b9add93c0eff3d
parent 18aa55b21f760d28897c505af4bfefaa9d1d8f74
parent c864f0b4360cb64b82f0ce1a1cb76dc023396524

Merge "Add API to get R8 version"

src/main/java/com/android/tools/r8/Version.java

diff --git a/src/main/java/com/android/tools/r8/Version.java b/src/main/java/com/android/tools/r8/Version.java
index d3347b9..010a851 100644
--- a/src/main/java/com/android/tools/r8/Version.java
+++ b/src/main/java/com/android/tools/r8/Version.java
@@ -25,4 +25,10 @@
   public static boolean isDev() {
     return LABEL.endsWith("-dev") || VersionProperties.INSTANCE.isEngineering();
   }
+
+  /** Returns current R8 version (with additional info) as a string. */
+  @SuppressWarnings("unused") // used by external tools to obtain R8 version
+  public static String getVersionString() {
+    return LABEL + " (" + VersionProperties.INSTANCE.getDescription() + ")";
+  }
 }

src/main/keep.txt

diff --git a/src/main/keep.txt b/src/main/keep.txt
index 61b2b14..306a398 100644
--- a/src/main/keep.txt
+++ b/src/main/keep.txt
@@ -14,6 +14,7 @@
 -keep public class com.android.tools.r8.compatdx.CompatDx { public static void main(java.lang.String[]); }
 -keep public class com.android.tools.r8.dexfilemerger.DexFileMerger { public static void main(java.lang.String[]); }
 -keep public class com.android.tools.r8.dexsplitter.DexSplitter { public static void main(java.lang.String[]); }
+-keep public class com.android.tools.r8.Version { public static java.lang.String getVersionString(); }
 
 # JvmMetadataExtensions must be kept because it'll be used indirectly through java.util.ServiceLoader.
 -keep, allowobfuscation public class com.android.tools.r8.jetbrains.kotlinx.metadata.jvm.impl.JvmMetadataExtensions { public <init>(); }