commit 898a705717bda6b7d18ccd7ad9b0b8b5384c9c3f
author Christoffer Adamsen <christofferqa@google.com> Wed Jan 15 09:33:26 2025 +0100
committer Christoffer Adamsen <christofferqa@google.com> Wed Jan 15 00:37:57 2025 -0800
tree 024fc4101ca0e8b2807f7aba8680d48674212486
parent 2efbbf5e0710e98ce10d2f65460ed650249f5f4c

Remove unused flag forceAnnotateSynthetics

Change-Id: Id97b9e08a59a4480d2d037ca514a11efe3bb438a

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

diff --git a/src/main/java/com/android/tools/r8/L8.java b/src/main/java/com/android/tools/r8/L8.java
index f744a67..62fe407 100644
--- a/src/main/java/com/android/tools/r8/L8.java
+++ b/src/main/java/com/android/tools/r8/L8.java
@@ -96,8 +96,6 @@
             // Desugar to class file format and turn off switch optimizations, as the final
             // compilation with D8 or R8 will do that.
             assert options.isCfDesugaring();
-            assert !options.forceAnnotateSynthetics;
-            options.forceAnnotateSynthetics = true;
             assert options.enableSwitchRewriting;
             options.enableSwitchRewriting = false;
             assert options.enableStringSwitchConversion;
@@ -108,7 +106,6 @@
 
             desugar(app, options, executorService);
 
-            options.forceAnnotateSynthetics = false;
             options.enableSwitchRewriting = true;
             options.enableStringSwitchConversion = true;
             options.enableVarHandleDesugaring = false;

src/main/java/com/android/tools/r8/utils/InternalOptions.java

diff --git a/src/main/java/com/android/tools/r8/utils/InternalOptions.java b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
index 7e9ccf9..fca7ee0 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -445,7 +445,6 @@
   public boolean enableTreeShakingOfLibraryMethodOverrides = false;
   public boolean encodeChecksums = false;
   public BiPredicate<String, Long> dexClassChecksumFilter = (name, checksum) -> true;
-  public boolean forceAnnotateSynthetics = false;
   public boolean readDebugSetFileEvent = false;
   public boolean disableL8AnnotationRemoval =
       System.getProperty("com.android.tools.r8.disableL8AnnotationRemoval") != null;