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

Merge "Revert "Don't ignore R8 warnings for optimized targets""

Browse Source
This commit is contained in:
Ajinkya Chalke
2023-02-09 14:37:38 +00:00
committed by Gerrit Code Review
parent f96b899f59 ddad41b912
commit a9728cfa39
1 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
java/dex.go
View File

@@ -42,8 +42,7 @@ type DexProperties struct {
// True if the module containing this has it set by default. // True if the module containing this has it set by default.
EnabledByDefault bool `blueprint:"mutated"` EnabledByDefault bool `blueprint:"mutated"`
// Whether to continue building even if warnings are emitted. Defaults to true unless bytecode // Whether to continue building even if warnings are emitted. Defaults to true.
// optimizations are enabled, in which case warnings are not ignored for safety.
Ignore_warnings *bool Ignore_warnings *bool
// If true, runs R8 in Proguard compatibility mode (default). // If true, runs R8 in Proguard compatibility mode (default).
@@ -333,9 +332,8 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Fl
} }
// TODO(b/180878971): missing classes should be added to the relevant builds. // TODO(b/180878971): missing classes should be added to the relevant builds.
// TODO(b/229727645): do not use true as default for unoptimized platform targets. // TODO(b/229727645): do not use true as default for Android platform builds.
ignoreWarningsDefault := !Bool(opt.Optimize) if proptools.BoolDefault(opt.Ignore_warnings, true) {
if proptools.BoolDefault(opt.Ignore_warnings, ignoreWarningsDefault) {
r8Flags = append(r8Flags, "-ignorewarnings") r8Flags = append(r8Flags, "-ignorewarnings")
} }