Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a9728cfa authored by Ajinkya Chalke's avatar Ajinkya Chalke Committed by Gerrit Code Review
Browse files

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

parents f96b899f ddad41b9

java/dex.go

+3 −5
Original line number Original line Diff line number Diff line
@@ -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")

	}

	}