From 5d3ec54b6b38ab85b0d3ef7634e697b3ae9fefb8 Mon Sep 17 00:00:00 2001 From: Jared Duke Date: Thu, 6 Jul 2023 23:01:25 +0000 Subject: [PATCH] Revert "Revert "Enable R8 full mode by default for apps"" This reverts commit ba283992ef8154efcc0abdfbf01b3c904f1c5445. Reason for revert: Resolved associated test/build failures Bug: 215530220 Test: atest BluetoothInstrumentationTests Test: atest RkpdAppGoogleUnitTests Change-Id: I27ad6a4f910fa8d48a3dc122c7542f8d7667de5a --- java/app.go | 1 + java/dex.go | 4 ++-- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/java/app.go b/java/app.go index 25909ec9d..a7f894a45 100755 --- a/java/app.go +++ b/java/app.go @@ -1030,6 +1030,7 @@ 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 7e7da00fd..7dd14bded 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 (default). - // Otherwise, runs R8 in full mode. + // If true, runs R8 in Proguard compatibility mode, otherwise runs R8 in full mode. + // Defaults to false for apps, true for libraries and tests. Proguard_compatibility *bool // If true, optimize for size by removing unused code. Defaults to true for apps,