commit 767c3c6ef490ba6762dba70cd29db58e56a75fb3
author Andrew Grieve <agrieve@google.com> Wed Jul 10 11:45:39 2024 -0400
committer Andrew Grieve <agrieve@google.com> Wed Jul 10 11:45:39 2024 -0400
tree a56c4a3a248b324868ab481557d3c759c276064f
parent 8ac4842d65c2a2fa9adefec9c43a08934b0e57f9

Fix androidApiExtensionPackages for .jar files that have non-.class entries

This fixes the feature for android.car.jar, which has META-INF/MANIFEST.MF

Bug: 344292509
Change-Id: I926230dc2ce81fae593b3d9c3dba08ca2b26d429

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 14efa1d..074df65 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -2053,8 +2053,12 @@
                   try {
                     ZipUtils.iter(
                         Paths.get(lib),
-                        (entry, input) -> consumer.accept(extractClassDescriptor(input)));
-                  } catch (IOException e) {
+                        (entry, input) -> {
+                          if (ZipUtils.isClassFile(entry.getName())) {
+                            consumer.accept(extractClassDescriptor(input));
+                          }
+                        });
+                  } catch (Exception e) {
                     throw new CompilationError("Failed to read extension library " + lib, e);
                   }
                 });