commit 5dcde3494965cb1ae81027e37614e6f4df93edcf
author clementbera <clementbera@google.com> Wed Sep 04 14:56:30 2019 +0200
committer Clément Béra <clementbera@google.com> Wed Sep 04 12:57:03 2019 +0000
tree 32e0b3eb15a6704770d7b0b99c978480dd2b0c80
parent d2fbd9818421348c79a8ea6cb9ae934bf6ac82a2

Use DexString/Type in RetargetCoreLib

Bug: 134732760
Change-Id: I25751fb53a0758d6360464b3e2fc6390b0b25c4b

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

diff --git a/src/main/java/com/android/tools/r8/BaseCompilerCommand.java b/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
index 9918583..fc8d448 100644
--- a/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
+++ b/src/main/java/com/android/tools/r8/BaseCompilerCommand.java
@@ -458,10 +458,10 @@
         if (desugaredLibraryConfigurationResource.getString().equals("default")) {
           if (libraryCompilation) {
             return DesugaredLibraryConfigurationForTesting
-                .configureLibraryDesugaringForLibraryCompilation(minAPILevel);
+                .configureLibraryDesugaringForLibraryCompilation(minAPILevel, factory);
           }
           return DesugaredLibraryConfigurationForTesting
-              .configureLibraryDesugaringForProgramCompilation(minAPILevel);
+              .configureLibraryDesugaringForProgramCompilation(minAPILevel, factory);
         }
       } catch (ResourceException e) {
         throw new RuntimeException(e);
@@ -473,8 +473,8 @@
       return libraryParser.parse(desugaredLibraryConfigurationResource);
     }
 
-    boolean hasDesugaredLibraryConfiguration(){
-      return desugaredLibraryConfigurationResources.size() == 1;
+    boolean hasDesugaredLibraryConfiguration() {
+      return !desugaredLibraryConfigurationResources.isEmpty();
     }
 
     /** Encodes checksum for each class when generating dex files. */
@@ -520,7 +520,7 @@
         }
         reporter.error(builder.toString());
       }
-      if (!desugaredLibraryConfigurationResources.isEmpty()) {
+      if (hasDesugaredLibraryConfiguration()) {
         reporter.warning(
             new StringDiagnostic("Desugared library configuration is still work in progress"));
       }