diff options
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 18 |
1 files changed, 7 insertions, 11 deletions
diff --git a/java/dex.go b/java/dex.go index f4b53f00a..1f71aee1a 100644 --- a/java/dex.go +++ b/java/dex.go @@ -324,20 +324,16 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, dexParams *compileDexParams) r8Deps = append(r8Deps, flags.dexClasspath...) transitiveStaticLibsLookupMap := map[android.Path]bool{} - if d.transitiveStaticLibsHeaderJarsForR8 != nil { - for _, jar := range d.transitiveStaticLibsHeaderJarsForR8.ToList() { - transitiveStaticLibsLookupMap[jar] = true - } + for _, jar := range d.transitiveStaticLibsHeaderJarsForR8.ToList() { + transitiveStaticLibsLookupMap[jar] = true } transitiveHeaderJars := android.Paths{} - if d.transitiveLibsHeaderJarsForR8 != nil { - for _, jar := range d.transitiveLibsHeaderJarsForR8.ToList() { - if _, ok := transitiveStaticLibsLookupMap[jar]; ok { - // don't include a lib if it is already packaged in the current JAR as a static lib - continue - } - transitiveHeaderJars = append(transitiveHeaderJars, jar) + for _, jar := range d.transitiveLibsHeaderJarsForR8.ToList() { + if _, ok := transitiveStaticLibsLookupMap[jar]; ok { + // don't include a lib if it is already packaged in the current JAR as a static lib + continue } + transitiveHeaderJars = append(transitiveHeaderJars, jar) } transitiveClasspath := classpath(transitiveHeaderJars) r8Flags = append(r8Flags, transitiveClasspath.FormJavaClassPath("-libraryjars")) |