commit 3fcd2bde91f2364ed0cbcdba928ff14eaab4c51c
author Ian Zerny <zerny@google.com> Mon Jan 30 20:14:12 2023 +0100
committer Ian Zerny <zerny@google.com> Mon Jan 30 20:14:12 2023 +0100
tree f55d49bc10cc39c7e5ac67aada991796b6895c39
parent 1eef0cb0f156bc8724dbb72752717ac27786f19b

Fix NPE introduced by injars/rules fixed point.

Change-Id: I002cb94c8df07eafd95f34d40d0106d21e067fe8

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

diff --git a/src/main/java/com/android/tools/r8/R8Command.java b/src/main/java/com/android/tools/r8/R8Command.java
index d017a2f..9f5c949 100644
--- a/src/main/java/com/android/tools/r8/R8Command.java
+++ b/src/main/java/com/android/tools/r8/R8Command.java
@@ -692,7 +692,9 @@
         for (FilteredClassPath injar : parser.getConfigurationBuilder().getInjars()) {
           if (seenInjars.add(injar)) {
             ArchiveResourceProvider provider = getAppBuilder().createAndAddProvider(injar);
-            providers.add(provider);
+            if (provider != null) {
+              providers.add(provider);
+            }
           }
         }
         if (providers.isEmpty()) {