Always initialize library class collection Art tests are not passing a library path and we are trying to remove Record Bug: 272250876 Change-Id: Iaa128ad7be450231d0d61579b9b69349d5188e28
diff --git a/src/main/java/com/android/tools/r8/graph/LazyLoadedDexApplication.java b/src/main/java/com/android/tools/r8/graph/LazyLoadedDexApplication.java index ee98d51..96d4bfa 100644 --- a/src/main/java/com/android/tools/r8/graph/LazyLoadedDexApplication.java +++ b/src/main/java/com/android/tools/r8/graph/LazyLoadedDexApplication.java
@@ -284,7 +284,7 @@ Builder(InternalOptions options, Timing timing) { super(options, timing); this.classpathClasses = ClasspathClassCollection.empty(); - this.libraryClasses = null; + this.libraryClasses = LibraryClassCollection.empty(); } private Builder(LazyLoadedDexApplication application) {
diff --git a/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java b/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java index c274aad..d1957a4 100644 --- a/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java +++ b/src/main/java/com/android/tools/r8/utils/LibraryClassCollection.java
@@ -13,6 +13,10 @@ super(null, classProvider); } + public static LibraryClassCollection empty() { + return new LibraryClassCollection(null); + } + @Override DexLibraryClass resolveClassConflict(DexLibraryClass a, DexLibraryClass b) { return a;