From a2ab93666db6ab22514f9c4c055dbc3c64d2f671 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Tue, 25 Jul 2023 21:37:17 +0000 Subject: [PATCH] Revert "Enable R8 full mode by default for apps""" This reverts commit 5d3ec54b6b38ab85b0d3ef7634e697b3ae9fefb8. Reason for revert: Breaks a SdkSandboxManagerTest Change-Id: I30c03d70a2b683f663b00866035ebf56339a4b0b --- java/app.go | 1 - java/dex.go | 4 ++-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/java/app.go b/java/app.go index a7f894a45..25909ec9d 100755 --- a/java/app.go +++ b/java/app.go @@ -1030,7 +1030,6 @@ func AndroidAppFactory() android.Module { module.Module.dexProperties.Optimize.EnabledByDefault = true module.Module.dexProperties.Optimize.Shrink = proptools.BoolPtr(true) - module.Module.dexProperties.Optimize.Proguard_compatibility = proptools.BoolPtr(false) module.Module.properties.Instrument = true module.Module.properties.Supports_static_instrumentation = true diff --git a/java/dex.go b/java/dex.go index 7dd14bded..7e7da00fd 100644 --- a/java/dex.go +++ b/java/dex.go @@ -45,8 +45,8 @@ type DexProperties struct { // Whether to continue building even if warnings are emitted. Defaults to true. Ignore_warnings *bool - // If true, runs R8 in Proguard compatibility mode, otherwise runs R8 in full mode. - // Defaults to false for apps, true for libraries and tests. + // If true, runs R8 in Proguard compatibility mode (default). + // Otherwise, runs R8 in full mode. Proguard_compatibility *bool // If true, optimize for size by removing unused code. Defaults to true for apps,