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

Add dependencies on d8 and r8 library arguments

Browse Source 
d8 and r8 were missing dependencies on jars passed as library
arguments.  This normally worked because the input jar is likely
to also depend on the same jars.  When the classpath was added
to d8 it started to fail on libraries that have no code but
include other static libraries.

Bug: 116840360
Test: rm out/soong/.intermediates/external/nist-sip/nist-sip/android_common/turbine-combined/nist-sip.jar && m out/soong/.intermediates/frameworks/base/ext/android_common/dex/ext.jar
Change-Id: Ie642f4a343b949778d8ee6dcc4511f3fd7633be1
This commit is contained in:
Colin Cross
2018-09-28 08:06:24 -07:00
parent f25112a70f
commit 6dab9bd57a
1 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
java/dex.go
View File

@@ -82,13 +82,17 @@ func (j *Module) dexCommonFlags(ctx android.ModuleContext) []string {
return flags return flags
} }
func (j *Module) d8Flags(ctx android.ModuleContext, flags javaBuilderFlags) []string { func (j *Module) d8Flags(ctx android.ModuleContext, flags javaBuilderFlags) ([]string, android.Paths) {
d8Flags := j.dexCommonFlags(ctx) d8Flags := j.dexCommonFlags(ctx)
d8Flags = append(d8Flags, flags.bootClasspath.FormTurbineClasspath("--lib")...) d8Flags = append(d8Flags, flags.bootClasspath.FormTurbineClasspath("--lib")...)
d8Flags = append(d8Flags, flags.classpath.FormTurbineClasspath("--lib")...) d8Flags = append(d8Flags, flags.classpath.FormTurbineClasspath("--lib")...)
return d8Flags var d8Deps android.Paths
d8Deps = append(d8Deps, flags.bootClasspath...)
d8Deps = append(d8Deps, flags.classpath...)
return d8Flags, d8Deps
} }
func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Flags []string, r8Deps android.Paths) { func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Flags []string, r8Deps android.Paths) {
@@ -113,6 +117,10 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F
r8Flags = append(r8Flags, flags.classpath.FormJavaClassPath("-libraryjars")) r8Flags = append(r8Flags, flags.classpath.FormJavaClassPath("-libraryjars"))
r8Flags = append(r8Flags, "-forceprocessing") r8Flags = append(r8Flags, "-forceprocessing")
r8Deps = append(r8Deps, proguardRaiseDeps...)
r8Deps = append(r8Deps, flags.bootClasspath...)
r8Deps = append(r8Deps, flags.classpath...)
flagFiles := android.Paths{ flagFiles := android.Paths{
android.PathForSource(ctx, "build/make/core/proguard.flags"), android.PathForSource(ctx, "build/make/core/proguard.flags"),
} }
@@ -182,12 +190,13 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
}, },
}) })
} else { } else {
d8Flags := j.d8Flags(ctx, flags) d8Flags, d8Deps := j.d8Flags(ctx, flags)
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: d8, Rule: d8,
Description: "d8", Description: "d8",
Output: javalibJar, Output: javalibJar,
Input: classesJar, Input: classesJar,
Implicits: d8Deps,
Args: map[string]string{ Args: map[string]string{
"d8Flags": strings.Join(d8Flags, " "), "d8Flags": strings.Join(d8Flags, " "),
"outDir": outDir.String(), "outDir": outDir.String(),