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

Merge "remove errorprone/processor classpath from r8 flags"

Browse Source
This commit is contained in:
Sam Delmerico
2023-02-01 16:01:32 +00:00
committed by Gerrit Code Review
parent 7fc88d5f49 704d6b9a62
commit acddda07de
1 changed files with 0 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
java/dex.go
View File

@@ -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 {