Revert "Revert "Enable R8 full mode by default for apps""

This reverts commit ba283992ef.

Reason for revert: Resolved associated test/build failures

Bug: 215530220
Test: atest BluetoothInstrumentationTests
Test: atest RkpdAppGoogleUnitTests
Change-Id: I27ad6a4f910fa8d48a3dc122c7542f8d7667de5a
This commit is contained in:
Jared Duke
2023-07-06 23:01:25 +00:00
parent 87987fd058
commit 5d3ec54b6b
2 changed files with 3 additions and 2 deletions

View File

@@ -1030,6 +1030,7 @@ func AndroidAppFactory() android.Module {
module.Module.dexProperties.Optimize.EnabledByDefault = true module.Module.dexProperties.Optimize.EnabledByDefault = true
module.Module.dexProperties.Optimize.Shrink = proptools.BoolPtr(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.Instrument = true
module.Module.properties.Supports_static_instrumentation = 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. // Whether to continue building even if warnings are emitted. Defaults to true.
Ignore_warnings *bool Ignore_warnings *bool
// If true, runs R8 in Proguard compatibility mode (default). // If true, runs R8 in Proguard compatibility mode, otherwise runs R8 in full mode.
// Otherwise, runs R8 in full mode. // Defaults to false for apps, true for libraries and tests.
Proguard_compatibility *bool Proguard_compatibility *bool
// If true, optimize for size by removing unused code. Defaults to true for apps, // If true, optimize for size by removing unused code. Defaults to true for apps,