commit 932c79284261b310f7e3642f60e0f6b3db377a1f
author Christoffer Adamsen <christofferqa@google.com> Mon Jan 06 08:30:02 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Mon Jan 06 08:30:02 2025 +0100
tree cbbf0844c5c42f83c4a466d19c54b378298b7976
parent 4d5413312c6c33bfa0a875ace2c347d740ae8bc5

Include origin in error when class file provider fails

Bug: b/387741684
Change-Id: I99e8ebb15e3433b8f7eed61cdc031c31cbeca033

src/main/java/com/android/tools/r8/ArchiveClassFileProvider.java

diff --git a/src/main/java/com/android/tools/r8/ArchiveClassFileProvider.java b/src/main/java/com/android/tools/r8/ArchiveClassFileProvider.java
index d3ee009..392a4bb 100644
--- a/src/main/java/com/android/tools/r8/ArchiveClassFileProvider.java
+++ b/src/main/java/com/android/tools/r8/ArchiveClassFileProvider.java
@@ -19,6 +19,7 @@
 import java.io.Closeable;
 import java.io.IOException;
 import java.io.InputStream;
+import java.io.UncheckedIOException;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.Files;
 import java.nio.file.NoSuchFileException;
@@ -116,7 +117,7 @@
       if (!Files.exists(archive)) {
         throw new NoSuchFileException(archive.toString());
       } else {
-        throw e;
+        throw new UncheckedIOException(archive.toString(), e);
       }
     }
     lazyDescriptors = new HashSet<>();