commit e5e89a74357cd6c0d4d98941861c4f9ebd6d460f
author Narayan Kamath <narayan@google.com> Wed Jan 18 12:43:29 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Jan 18 12:43:29 2017 +0000
tree c2f84fcae5937483e343b470a9a829cad36ba57d
parent dd8a4dd23318fb686c11585502badb678679b17b
parent a74492c8e5ed4a232f6853b532b09dd65fd66b4a

vogar: Add --language JO. am: 913af10506 am: 5ea7c77194
am: a74492c8e5

Change-Id: Ia3191e38ad4ef2773f3523368ba805b8c9a4e2b9

src/vogar/Language.java

diff --git a/src/vogar/Language.java b/src/vogar/Language.java
index e50316e..c8da318 100644
--- a/src/vogar/Language.java
+++ b/src/vogar/Language.java
@@ -20,14 +20,15 @@
  * An enum for the different language variants supported by vogar.
  */
 public enum Language {
-  J17("1.7", "1.7", 21),
-  JN("1.8", "1.8", 24);
+  J17("1.7", "1.7", "21"),
+  JN("1.8", "1.8", "24"),
+  JO("1.8", "1.8", "o-b1");
 
   private final String javacSourceAndTarget;
   private final String jackSourceVersion;
-  private final int jackMinApilevel;
+  private final String jackMinApilevel;
 
-  Language(String javacSourceAndTarget, String jackSourceVersion, int jackMinApiLevel) {
+  Language(String javacSourceAndTarget, String jackSourceVersion, String jackMinApiLevel) {
     this.javacSourceAndTarget = javacSourceAndTarget;
     this.jackSourceVersion = jackSourceVersion;
     this.jackMinApilevel = jackMinApiLevel;
@@ -41,7 +42,7 @@
     return jackSourceVersion;
   }
 
-  public int getJackMinApilevel() {
+  public String getJackMinApilevel() {
     return jackMinApilevel;
   }
 }

src/vogar/Vogar.java

diff --git a/src/vogar/Vogar.java b/src/vogar/Vogar.java
index a4bd2da..5f0bfaf 100644
--- a/src/vogar/Vogar.java
+++ b/src/vogar/Vogar.java
@@ -252,7 +252,7 @@
         System.out.println("  --toolchain <jdk|jack>: Which toolchain to use.");
         System.out.println("      Default is: " + toolchain);
         System.out.println();
-        System.out.println("  --language <J17|JN>: Which language level to use.");
+        System.out.println("  --language <J17|JN|JO>: Which language level to use.");
         System.out.println("      Default is: " + language);
         System.out.println();
         System.out.println("  --ssh <host:port>: target a remote machine via SSH.");