From ba283992ef8154efcc0abdfbf01b3c904f1c5445 Mon Sep 17 00:00:00 2001 From: Kenneth Ford Date: Wed, 28 Jun 2023 23:29:21 +0000 Subject: [PATCH] Revert "Enable R8 full mode by default for apps" This reverts commit 93d0bffafeac5a9c96b5921d5c48d3d78594e68b. Reason for revert: Possible culprit for b/289285719 Change-Id: If818db9d38008ea9d8c7813b9f6fabc2975e8507 --- 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 78d560fc1..d9272e4fc 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,