StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Revert "Enable R8 full mode by default for apps"" am: 510616ca9d am: 7f3b9d34d0 am: 3029a7ebfd am: 97191c39e6 am: cea96b660b

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

Change-Id: I4063473fa3fa8ac416fe215f31f8b94a81848f52
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Kenneth Ford
2023-06-29 03:56:08 +00:00
committed by Automerger Merge Worker
parent 615c80eb6f cea96b660b
commit 9d67c9e161
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
java/app.go
View File

@@ -1030,7 +1030,6 @@ 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

4
java/dex.go
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, otherwise runs R8 in full mode. // If true, runs R8 in Proguard compatibility mode (default).
// Defaults to false for apps, true for libraries and tests. // Otherwise, runs R8 in full mode.
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,