Update R8 to 9.1.5-dev

This version of D8/R8 uses shorter minimal names, using a naming convention similar to the one javac uses for anonymous inner classes ($0, $1, ...). Existing D8/R8 builds are updated to use the previous naming scheme, with `$$ExternalSynthetic` markers.

Commits merged (since 9.1.2-dev):
08852644ce Version 9.1.5-dev
18318cc30f Merge commit '048a805162f6d0a4d405187b455b1a7a3c25080b' into dev-release
048a805162 Support for verbose synthetic names in GlobalSyntheticsGenerator CLI
9605a571ce Suppress errorprone warning in same file policy
22b15c7684 Format InternalOptions
15f247933b Relax same file policy for synthetic classes
be94ff4e23 Version 9.1.4-dev
035b95051f Merge commit '0418ebca1a206d3202ac6f7327846de002b67191' into dev-release
0418ebca1a Support for enabling verbose synthetic names in D8 CLI
81ccdd3d7f Add -Pdisable_download_deps property for skipping downloadDeps task
1d307634c0 Introduce "enable_r8_turbo_builds" gradle property
9fea8bb37b Version 9.1.3-dev
8fee7be0b1 Merge commit '6f6301de90ff4cd5a1a08d550bcf350a9bf0ec42' into dev-release
6f6301de90 Account for api outlines in examples tests
c7b6ec68b0 Use jstack from third_party dependencies
6fc71e3937 Add support for releasing main to 9.0 stable branch
67ae3cf5ae Hold reference to Unsafe in a static field in VarHandle desugaring
777b810d99 Add a test that final flag of record fields is not unset
38b686c0e7 Fix missing argument
c51ad7f192 API for enabling verbose synthetic names
8e0fc7296f Enable minimal synthetic names
b5aea02388 Remove @deprecated method from SyntheticItemsTestUtils
f768907903 Refactor D8 examples tests to be independent of synthetic naming
885ffeecb9 Refactor desugaring and examples tests to not rely on synthetic naming
32dd65c956 Add missing @OverRide annotations

See https://r8.googlesource.com/r8/+log/08852644ce79fc699a3e0694ef3125509affc455

PiperOrigin-RevId: 839627647
Change-Id: I0491f6d72a1084fc513daac49c3924f84e24a0db

Author: A Googler

src/tools/java/com/google/devtools/build/android/r8/CompatDexBuilder.java

@@ -362,6 +362,7 @@ private DexConsumer dexEntry(
         .setMinApiLevel(minSdkVersion)
         .setDisableDesugaring(true)
         .setIntermediate(true);
+    R8Utils.setEnableVerboseSyntheticNames(builder);
     byte[] cachedDexBytes = null;
     byte[] classFileBytes = null;
     try (InputStream stream = zipFile.getInputStream(classEntry)) {

src/tools/java/com/google/devtools/build/android/r8/CompatDx.java

@@ -437,16 +437,15 @@ private static void run(String[] args)
 
     try {
       D8Command.Builder builder = D8Command.builder();
-      inputs.forEach(
-          input ->
-              builder.addProgramResourceProvider(ArchiveResourceProvider.fromArchive(input, true)));
-
+      for (Path input : inputs) {
+        builder.addProgramResourceProvider(ArchiveResourceProvider.fromArchive(input, true));
+      }
       builder
-          // .addProgramFiles(inputs)
           .setProgramConsumer(createConsumer(inputs, output, singleDexFile, dexArgs.keepClasses))
           .setMode(mode)
           .setDisableDesugaring(true) // DX does not desugar.
           .setMinApiLevel(dexArgs.minApiLevel);
+      R8Utils.setEnableVerboseSyntheticNames(builder);
       if (mainDexList != null) {
         builder.addMainDexListFiles(mainDexList);
       }

src/tools/java/com/google/devtools/build/android/r8/Desugar.java

@@ -426,6 +426,7 @@ private void desugar(
               .setMinApiLevel(options.minSdkVersion)
               .setSyntheticInfoConsumer(consumer.getContextConsumer())
               .setProgramConsumer(consumer);
+      R8Utils.setEnableVerboseSyntheticNames(builder);
       bootclasspathProviders.forEach(builder::addLibraryResourceProvider);
       if (desugaredLibConfig != null) {
         builder.addDesugaredLibraryConfiguration(Files.readString(desugaredLibConfig));

src/tools/java/com/google/devtools/build/android/r8/DexFileMerger.java

@@ -101,6 +101,7 @@ public boolean isMultidexAllowed() {
 
   /** Option converter for {@link MultidexStrategy}. */
   public static class MultidexStrategyConverter implements IStringConverter<MultidexStrategy> {
+    @Override
     public MultidexStrategy convert(String value) {
       return MultidexStrategy.valueOf(value.toUpperCase());
     }
@@ -325,6 +326,9 @@ public static void run(String[] args) throws CompilationFailedException, IOExcep
     // The merge step assumes that no further desugaring is needed.
     builder = builder.setDisableDesugaring(true);
 
+    // Enable verbose synthetic names that use the `$$ExternalSynthetic` marker.
+    R8Utils.setEnableVerboseSyntheticNames(builder);
+
     // D8 does not allow duplicate classes. Resolve conflicts based on input order.
     Map<String, Integer> inputOrdering =
         Maps.newHashMapWithExpectedSize(options.inputArchives.size());

src/tools/java/com/google/devtools/build/android/r8/R8Utils.java

@@ -13,10 +13,29 @@
 // limitations under the License.
 package com.google.devtools.build.android.r8;
 
+import java.lang.reflect.InvocationTargetException;
+import java.lang.reflect.Method;
+
 /** Utilities related to the R8 code base */
 public class R8Utils {
   public static final String INTERFACE_COMPANION_SUFFIX = "$-CC";
   public static final String DESUGAR_INTERFACE_COMPANION_SUFFIX = "$$CC";
 
   private R8Utils() {}
+
+  public static void setEnableVerboseSyntheticNames(Object commandBuilder) {
+    try {
+      Class<?> commandBuilderClass = commandBuilder.getClass();
+      Method setEnableVerboseSyntheticNamesMethod =
+          commandBuilderClass.getDeclaredMethod(
+              "setEnableVerboseSyntheticNames", boolean.class);
+      setEnableVerboseSyntheticNamesMethod.invoke(commandBuilder, true);
+    } catch (IllegalAccessException e) {
+      // Intentionally empty.
+    } catch (InvocationTargetException e) {
+      // Intentionally empty.
+    } catch (NoSuchMethodException e) {
+      // Intentionally empty.
+    }
+  }
 }