commit dee6418a859d1b9c28615232a566d6c73c6068dc
author Christoffer Quist Adamsen <christofferqa@google.com> Tue Jul 04 10:37:52 2023 +0200
committer Christoffer Adamsen <christofferqa@google.com> Tue Jul 04 10:29:00 2023 +0000
tree e836b4fec4b7752a892f86a13eb17cb325da463d
parent 56004fa07175b5b3a9f6f3a0ab97c2aa7af52b85

Disallow access modification by default when not optimizing

Change-Id: Iebf6e0189fd6282c4d5d621579de914a2e060db5

src/main/java/com/android/tools/r8/optimize/accessmodification/AccessModifierOptions.java

diff --git a/src/main/java/com/android/tools/r8/optimize/accessmodification/AccessModifierOptions.java b/src/main/java/com/android/tools/r8/optimize/accessmodification/AccessModifierOptions.java
index 99a0645..7644cb3 100644
--- a/src/main/java/com/android/tools/r8/optimize/accessmodification/AccessModifierOptions.java
+++ b/src/main/java/com/android/tools/r8/optimize/accessmodification/AccessModifierOptions.java
@@ -22,14 +22,13 @@
   }
 
   public boolean isAccessModificationEnabled() {
-    // TODO(b/288062771): Enable access modification for L8.
-    if (!options.synthesizedClassPrefix.isEmpty()) {
-      return false;
+    if (isAccessModificationRulePresent()) {
+      return true;
     }
-    if (options.forceProguardCompatibility) {
-      return isAccessModificationRulePresent();
-    }
-    return true;
+    // TODO(b/288062771): Enable access modification by default for L8.
+    return options.synthesizedClassPrefix.isEmpty()
+        && !options.forceProguardCompatibility
+        && options.isOptimizing();
   }
 
   private boolean isAccessModificationRulePresent() {