commit c933a05659b0b0808dbf898636b6ef6a9319e55c
author Rico Wind <ricow@google.com> Tue May 24 12:08:53 2022 +0200
committer Rico Wind <ricow@google.com> Wed May 25 11:03:32 2022 +0000
tree 932e9ff5a2328fe3ace9ac9af3d2ac2a5c3127d0
parent 8c87f00e04bf7ab69eae417b3b7923226030cb9a

Add system property flag for disabling deferred tracing

Bug: b/233630328
Change-Id: I7731f991566ecdfdd55eddaace18e302c92dbbec

src/main/java/com/android/tools/r8/shaking/EnqueuerDeferredTracing.java

diff --git a/src/main/java/com/android/tools/r8/shaking/EnqueuerDeferredTracing.java b/src/main/java/com/android/tools/r8/shaking/EnqueuerDeferredTracing.java
index 046931d..78abb50 100644
--- a/src/main/java/com/android/tools/r8/shaking/EnqueuerDeferredTracing.java
+++ b/src/main/java/com/android/tools/r8/shaking/EnqueuerDeferredTracing.java
@@ -25,7 +25,9 @@
       return empty();
     }
     InternalOptions options = appView.options();
-    if (!options.isOptimizing() || !options.isShrinking()) {
+    if (!options.isOptimizing()
+        || !options.isShrinking()
+        || !options.enableEnqueuerDeferredTracing) {
       return empty();
     }
     return new EnqueuerDeferredTracingImpl(appView, enqueuer, mode);

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 d89a607..f3b82e4d 100644
--- a/src/main/java/com/android/tools/r8/utils/InternalOptions.java
+++ b/src/main/java/com/android/tools/r8/utils/InternalOptions.java
@@ -611,6 +611,9 @@
   // public boolean lookupLibraryBeforeProgram =
   //     System.getProperty("com.android.tools.r8.lookupProgramBeforeLibrary") == null;
 
+  public boolean enableEnqueuerDeferredTracing =
+      System.getProperty("com.android.tools.r8.disableEnqueuerDeferredTracing") == null;
+
   public boolean loadAllClassDefinitions = false;
 
   // Whether or not to check for valid multi-dex builds.