diff options
| author | 2023-08-02 21:38:29 +0000 | |
|---|---|---|
| committer | 2023-08-02 21:38:29 +0000 | |
| commit | cfe9e6d00823dbf4bfdd9f29a57c6a82baf68e97 (patch) | |
| tree | 8c4f7f7d8785057e01c5b8a3025c4e5cc81233cf /java | |
| parent | b82c236cbb0db6f8a0b2fe7a323eb34e69446bf8 (diff) | |
| parent | a9f5c57b90609c3308c02048a45894fe15191416 (diff) | |
Merge "Reland "Enable R8 full mode by default for apps"" into main
Diffstat (limited to 'java')
| -rwxr-xr-x | java/app.go | 1 | ||||
| -rw-r--r-- | java/dex.go | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/java/app.go b/java/app.go index 224bc8867..7172d229e 100755 --- a/java/app.go +++ b/java/app.go @@ -1055,6 +1055,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, |