commit 1cd1729011e33b6241f595e37da4423cf78e26e2
author Rico Wind <ricow@google.com> Wed May 25 14:00:28 2022 +0200
committer Rico Wind <ricow@google.com> Mon May 30 12:54:25 2022 +0000
tree 4c5e634062f4460d6c7a87a288b6e56b4e05f942
parent 1db9d96d6ada504e5a95bbca09f3f2d35ad2e11c

Disable deferred tracing in R8

Bug: 227455445
Bug: 233630328
Test: m -j77 SystemUI + disasm grep mStatusBarWindowCallback
Change-Id: I2d6bb859e74c1afc398e629e53d2ce541ef27642

java/config/config.go

diff --git a/java/config/config.go b/java/config/config.go
index d744002..e728b7d 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -95,6 +95,8 @@
 	}, dexerJavaVmFlagsList...))
 	exportedVars.ExportStringListStaticVariable("R8Flags", append([]string{
 		"-JXmx2048M",
+		// Disable this optimization as it can impact weak reference semantics. See b/233432839.
+		"-JDcom.android.tools.r8.disableEnqueuerDeferredTracing=true",
 	}, dexerJavaVmFlagsList...))
 
 	exportedVars.ExportStringListStaticVariable("CommonJdkFlags", []string{