| commit | fb689fd74919f5298d94b300f3dcf98234a4b22e | [log] [tgz] |
|---|---|---|
| author | Rico Wind <ricow@google.com> | Wed Mar 08 15:27:03 2023 +0100 |
| committer | Rico Wind <ricow@google.com> | Wed Mar 08 14:31:13 2023 +0000 |
| tree | 443f7beef851246a6fd9cae788b4e920946e3765 | |
| parent | 57e9e07754d791fdf08fb322292bd88103484105 [diff] |
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;