diff options
author | Alan Leung <acleung@google.com> | 2017-07-17 16:01:00 -0700 |
---|---|---|
committer | Alan Leung <acleung@google.com> | 2017-07-17 16:01:00 -0700 |
commit | 5bce0967b548f814aac8549ec398dc15254e6f44 (patch) | |
tree | 2f5aa0e5d1d1b887438ce7688e30aa337c9948b6 /src/main/java/com/android/tools/r8 | |
parent | a19e721dd6d7728063e33299855c3c19813482e5 (diff) | |
download | r8-5bce0967b548f814aac8549ec398dc15254e6f44.tar.gz |
Allows multiple --min-sdk in CompatDX
Bug:
Change-Id: Ib69395f51211b4428146a5dd3bfe72872e0fc580
Diffstat (limited to 'src/main/java/com/android/tools/r8')
-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 c174a31ae..c871e7516 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); |