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

Commit 704d6b9a authored by Sam Delmerico's avatar Sam Delmerico
Browse files

remove errorprone/processor classpath from r8 flags 

This classpath includes compile-time-only jars that may conflict with program/library jars referenced by R8 and used by the target.

Test: go test ./java
Test: m && inspect output for r8 warnings
Bug: 242088131
Change-Id: Id4db3c9482e78cdcc0c9d37b9a77eaf94ac95cb3
parent f21f25f1

java/dex.go

+0 −7
Original line number Diff line number Diff line
@@ -22,7 +22,6 @@ import ( 
	"github.com/google/blueprint/proptools"



	"android/soong/android"

	"android/soong/java/config"

	"android/soong/remoteexec"

)
@@ -259,12 +258,6 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Fl 
	r8Deps = append(r8Deps, flags.bootClasspath...)

	r8Flags = append(r8Flags, flags.dexClasspath.FormJavaClassPath("-libraryjars"))

	r8Deps = append(r8Deps, flags.dexClasspath...)

	r8Flags = append(r8Flags, flags.processorPath.FormJavaClassPath("-libraryjars"))

	r8Deps = append(r8Deps, flags.processorPath...)



	errorProneClasspath := classpath(android.PathsForSource(ctx, config.ErrorProneClasspath))

	r8Flags = append(r8Flags, errorProneClasspath.FormJavaClassPath("-libraryjars"))

	r8Deps = append(r8Deps, errorProneClasspath...)



	transitiveStaticLibsLookupMap := map[android.Path]bool{}

	if d.transitiveStaticLibsHeaderJars != nil {