commit 707b281b91982244838db1e907b84ec843945443
author Morten Krogh-Jespersen <mkroghj@google.com> Tue Nov 08 13:05:16 2022 +0100
committer Morten Krogh-Jespersen <mkroghj@google.com> Wed Nov 09 08:58:05 2022 +0000
tree 3686cc0b350e1f51fae75b35b0c7b6f105c68a3e
parent d2347586f64c38877a20269bfe01f79a627f868f

Use hardcoded vm ART_6_0_1_HOST for running dex2oat

Bug: b/258170524
Change-Id: Ib7ab5f5f0f7dc7749ec413ab68a0f6095ffcde7c

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 0230b46..889c419 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -413,6 +413,9 @@
 
     private final Version version;
     private final Kind kind;
+
+    // TODO(b/258170524): Should be a new version that works.
+    public static final DexVm LATEST_DEX2OAT = ART_6_0_1_HOST;
   }
 
 
@@ -2000,10 +2003,8 @@
         vm.version == DexVm.Version.V10_0_0
             || vm.version == DexVm.Version.V12_0_0
             || vm.version == DexVm.Version.V13_0_0);
-    if (vm.isOlderThanOrEqual(DexVm.ART_4_4_4_HOST)) {
-      // Run default dex2oat for tests on dalvik runtimes.
-      vm = DexVm.ART_DEFAULT;
-    }
+    // TODO(b/258170524): Either remove `vm` as an argument or change using a specific version.
+    vm = DexVm.LATEST_DEX2OAT;
     assert Files.exists(file);
     assert ByteStreams.toByteArray(Files.newInputStream(file)).length > 0;
     List<String> command = new ArrayList<>();