commit ae29092c6e53b22ef79f07e8a239cfef4b7762a4
author Søren Gjesse <sgjesse@google.com> Mon Sep 11 15:12:42 2023 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Sep 11 13:29:52 2023 +0000
tree 82deebd7c81de66f73815f7971e8ab02c29bacdf
parent 4ad7ffe71a9e3c7f05f23f9196404bca9cac9f0e

Fix ServiceLoaderDesugaredLibraryTest on Art 8.1.0

Change-Id: Ideaf17ced84a1f5052be2cd7b447fc8f27fac510

src/test/java/com/android/tools/r8/ToolHelper.java

diff --git a/src/test/java/com/android/tools/r8/ToolHelper.java b/src/test/java/com/android/tools/r8/ToolHelper.java
index d9558e4..8f31142 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -1338,10 +1338,9 @@
       case P:
         return DexVm.Version.V9_0_0;
       case O_MR1:
-        return DexVm.Version.V8_1_0;
       case O:
-        // Somewhere on the way to 8.0.0.
-        return DexVm.Version.DEFAULT;
+        // Currently no Android 8 VM, so return 8.1 for both O and O_MR1.
+        return DexVm.Version.V8_1_0;
       case N:
         return DexVm.Version.V7_0_0;
       case M: