Merge "Revert "Enable R8 full mode by default for apps"" am: 510616ca9d

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2644757

Change-Id: Ic7e2d36b743f91b00cddd34df8b89489a2b952c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kenneth Ford
2023-06-29 00:59:36 +00:00
committed by Automerger Merge Worker
2 changed files with 2 additions and 3 deletions

View File

@@ -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

View File

@@ -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,