diff options
Diffstat (limited to 'src/main/java/com/android/tools/r8/compatdx/CompatDx.java')
-rw-r--r-- | src/main/java/com/android/tools/r8/compatdx/CompatDx.java | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/src/main/java/com/android/tools/r8/compatdx/CompatDx.java b/src/main/java/com/android/tools/r8/compatdx/CompatDx.java index a547d126e..b77493f59 100644 --- a/src/main/java/com/android/tools/r8/compatdx/CompatDx.java +++ b/src/main/java/com/android/tools/r8/compatdx/CompatDx.java @@ -294,9 +294,12 @@ public class CompatDx { multiDex = options.has(spec.multiDex); mainDexList = options.valueOf(spec.mainDexList); minimalMainDex = options.has(spec.minimalMainDex); - minApiLevel = options.has(spec.minApiLevel) - ? options.valueOf(spec.minApiLevel) - : Constants.DEFAULT_ANDROID_API; + if (options.has(spec.minApiLevel)) { + List<Integer> allMinApiLevels = options.valuesOf(spec.minApiLevel); + minApiLevel = allMinApiLevels.get(allMinApiLevels.size() - 1); + } else { + minApiLevel = Constants.DEFAULT_ANDROID_API; + } inputList = options.valueOf(spec.inputList); inputs = ImmutableList.copyOf(options.valuesOf(spec.inputs)); maxIndexNumber = options.valueOf(spec.maxIndexNumber); |