commit | 70ea3c0a8b47c48573953e70f7cdcb0820b34fa9 | [log] [tgz] |
---|---|---|
author | Mads Ager <ager@google.com> | Mon Oct 16 14:30:39 2017 +0200 |
committer | Mads Ager <ager@google.com> | Mon Oct 16 14:30:39 2017 +0200 |
tree | 11eee07d354a6a606f3f0b2a1473075ece1d8321 | |
parent | 446d32753a9aceb4aa054c86a62d90fea3f12566 [diff] |
Version 0.1.20. Fix bad merge in version 0.1.18 and 0.1.19. R=sgjesse@google.com Change-Id: Ib56a899390de31cc2303c12d78f8508e9c771b55
diff --git a/src/main/java/com/android/tools/r8/D8.java b/src/main/java/com/android/tools/r8/D8.java index 99ac5e2..d9c37c0 100644 --- a/src/main/java/com/android/tools/r8/D8.java +++ b/src/main/java/com/android/tools/r8/D8.java
@@ -55,7 +55,7 @@ */ public final class D8 { - private static final String VERSION = "v0.1.19"; + private static final String VERSION = "v0.1.20"; private static final int STATUS_ERROR = 1; private D8() {}
diff --git a/src/main/java/com/android/tools/r8/GenerateMainDexList.java b/src/main/java/com/android/tools/r8/GenerateMainDexList.java index 66415ec..77917af 100644 --- a/src/main/java/com/android/tools/r8/GenerateMainDexList.java +++ b/src/main/java/com/android/tools/r8/GenerateMainDexList.java
@@ -28,7 +28,7 @@ import java.util.stream.Collectors; public class GenerateMainDexList { - private static final String VERSION = "v0.1.19"; + private static final String VERSION = "v0.1.20"; private final Timing timing = new Timing("maindex"); private final InternalOptions options;
diff --git a/src/main/java/com/android/tools/r8/R8.java b/src/main/java/com/android/tools/r8/R8.java index 0a16436..3378afa 100644 --- a/src/main/java/com/android/tools/r8/R8.java +++ b/src/main/java/com/android/tools/r8/R8.java
@@ -71,7 +71,7 @@ public class R8 { - private static final String VERSION = "v0.1.19"; + private static final String VERSION = "v0.1.20"; private final Timing timing = new Timing("R8"); private final InternalOptions options;
diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java index 80ab396..5d8c115 100644 --- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java +++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -363,6 +363,6 @@ // // https://android.googlesource.com/platform/dalvik/+/ics-mr0/vm/mterp/out/InterpAsm-x86-atom.S#25106 public boolean canUseFilledNewArrayOfObjects() { - return minApiLevel >= AndroidApiLevel.K.getLevel(); + return minApiLevel >= Constants.ANDROID_K_API; } }