R8 full mode by default when RELEASE_R8_FULL_MODE_BY_DEFAULT is enabled
Bug: 215530220
Test: existing
Change-Id: I4360e7ba42a4f27adc347ef3f6fa7511c27366f7
diff --git a/java/dex.go b/java/dex.go
index 4a7e9dc..8c93bb4 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -378,7 +378,7 @@
r8Flags = append(r8Flags, "--keep-runtime-invisible-annotations")
}
- if BoolDefault(opt.Proguard_compatibility, true) {
+ if BoolDefault(opt.Proguard_compatibility, !ctx.Config().UseR8FullModeByDefault()) {
r8Flags = append(r8Flags, "--force-proguard-compatibility")
}