commit 5d36716242d8728007bfccdb4965cc9641c2afa0
author Christoffer Quist Adamsen <christofferqa@google.com> Fri Jun 16 10:31:12 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Fri Jun 16 10:22:33 2023 +0000
tree 995cc1ee4e170f4a25a411f058c98ed655082594
parent ede5cef448dd2738c5c5f688a59797d172be5717

Fix FileNotFoundException from art cache

Change-Id: I986ab84c94aba710419d2a2b7811663639064d4a

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 55994a2..069acbf 100644
--- a/src/test/java/com/android/tools/r8/ToolHelper.java
+++ b/src/test/java/com/android/tools/r8/ToolHelper.java
@@ -829,19 +829,19 @@
           .put(DexVm.ART_6_0_1_HOST, "bin/art")
           .build();
 
-  private static final List<String> DALVIK_BOOT_LIBS =
-      ImmutableList.of(
-          "core-libart-hostdex.jar",
-          "core-hostdex.jar",
-          "apache-xml-hostdex.jar");
+  private static final List<String> DALVIK_4_0_BOOT_LIBS =
+      ImmutableList.of("core-hostdex.jar", "apache-xml-hostdex.jar");
 
-  private static final List<String> ART_BOOT_LIBS =
-      ImmutableList.of(
-          "core-libart-hostdex.jar",
-          "core-oj-hostdex.jar",
-          "apache-xml-hostdex.jar");
+  private static final List<String> DALVIK_4_4_BOOT_LIBS =
+      ImmutableList.of("core-libart-hostdex.jar", "core-hostdex.jar", "apache-xml-hostdex.jar");
 
-  private static final List<String> NEWER_ART_BOOT_LIBS =
+  private static final List<String> ART_5_TO_6_BOOT_LIBS =
+      ImmutableList.of("core-libart-hostdex.jar");
+
+  private static final List<String> ART_7_TO_10_BOOT_LIBS =
+      ImmutableList.of("core-libart-hostdex.jar", "core-oj-hostdex.jar", "apache-xml-hostdex.jar");
+
+  private static final List<String> ART_12_PLUS_BOOT_LIBS =
       ImmutableList.of(
           "core-libart-hostdex.jar",
           "core-oj-hostdex.jar",
@@ -853,18 +853,18 @@
   static {
     ImmutableMap.Builder<DexVm, List<String>> builder = ImmutableMap.builder();
     builder
-        .put(DexVm.ART_DEFAULT, ART_BOOT_LIBS)
-        .put(DexVm.ART_14_0_0_HOST, NEWER_ART_BOOT_LIBS)
-        .put(DexVm.ART_13_0_0_HOST, NEWER_ART_BOOT_LIBS)
-        .put(DexVm.ART_12_0_0_HOST, NEWER_ART_BOOT_LIBS)
-        .put(DexVm.ART_10_0_0_HOST, ART_BOOT_LIBS)
-        .put(DexVm.ART_9_0_0_HOST, ART_BOOT_LIBS)
-        .put(DexVm.ART_8_1_0_HOST, ART_BOOT_LIBS)
-        .put(DexVm.ART_7_0_0_HOST, ART_BOOT_LIBS)
-        .put(DexVm.ART_6_0_1_HOST, ART_BOOT_LIBS)
-        .put(DexVm.ART_5_1_1_HOST, ART_BOOT_LIBS)
-        .put(DexVm.ART_4_4_4_HOST, DALVIK_BOOT_LIBS)
-        .put(DexVm.ART_4_0_4_HOST, DALVIK_BOOT_LIBS);
+        .put(DexVm.ART_DEFAULT, ART_7_TO_10_BOOT_LIBS)
+        .put(DexVm.ART_14_0_0_HOST, ART_12_PLUS_BOOT_LIBS)
+        .put(DexVm.ART_13_0_0_HOST, ART_12_PLUS_BOOT_LIBS)
+        .put(DexVm.ART_12_0_0_HOST, ART_12_PLUS_BOOT_LIBS)
+        .put(DexVm.ART_10_0_0_HOST, ART_7_TO_10_BOOT_LIBS)
+        .put(DexVm.ART_9_0_0_HOST, ART_7_TO_10_BOOT_LIBS)
+        .put(DexVm.ART_8_1_0_HOST, ART_7_TO_10_BOOT_LIBS)
+        .put(DexVm.ART_7_0_0_HOST, ART_7_TO_10_BOOT_LIBS)
+        .put(DexVm.ART_6_0_1_HOST, ART_5_TO_6_BOOT_LIBS)
+        .put(DexVm.ART_5_1_1_HOST, ART_5_TO_6_BOOT_LIBS)
+        .put(DexVm.ART_4_4_4_HOST, DALVIK_4_4_BOOT_LIBS)
+        .put(DexVm.ART_4_0_4_HOST, DALVIK_4_0_BOOT_LIBS);
     BOOT_LIBS = builder.build();
   }
 
@@ -888,7 +888,6 @@
     PRODUCT = builder.build();
   }
 
-
   private static Path getDexVmPath(DexVm vm) {
     DexVm.Version version = vm.getVersion();
     Path base = Paths.get(TOOLS_DIR, "linux");