Merge "Remove R8-specific flags from soong config" am: fd659ef7da am: b2c9c069be am: b23458389c
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2412732
Change-Id: Ie29230c535bae6f1d85c65338211dd387526c3b6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/java/config/config.go b/java/config/config.go
index b69a715..7c22076 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -96,10 +96,6 @@
}, 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",
- // Disable class merging across different files to improve attribution. See b/242881914.
- "-JDcom.android.tools.r8.enableSameFilePolicy=true",
}, dexerJavaVmFlagsList...))
exportedVars.ExportStringListStaticVariable("CommonJdkFlags", []string{