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

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

Browse Source 
This reverts commit 5c2a1f3bda.

Reason for revert: This change is causing the build to break, see http://b/268404998

Change-Id: I9173d1aa42846831123273ef7651940f2b0d6608
This commit is contained in:
Ajinkya Chalke
2023-02-09 14:09:58 +00:00
committed by Gerrit Code Review
parent 5c2a1f3bda
commit ddad41b912
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

@@ -43,8 +43,7 @@ type DexProperties struct {
// True if the module containing this has it set by default.
EnabledByDefault bool `blueprint:"mutated"`
// Whether to continue building even if warnings are emitted. Defaults to true unless bytecode
// optimizations are enabled, in which case warnings are not ignored for safety.
// Whether to continue building even if warnings are emitted. Defaults to true.
Ignore_warnings *bool
// If true, runs R8 in Proguard compatibility mode (default).
@@ -340,9 +339,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/229727645): do not use true as default for unoptimized platform targets.
ignoreWarningsDefault := !Bool(opt.Optimize)
if proptools.BoolDefault(opt.Ignore_warnings, ignoreWarningsDefault) {
// TODO(b/229727645): do not use true as default for Android platform builds.
if proptools.BoolDefault(opt.Ignore_warnings, true) {
r8Flags = append(r8Flags, "-ignorewarnings")
}