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

Merge "Declare the implicit outputs for r8RE" into main

Browse Source
This commit is contained in:
Spandan Das
2024-06-24 20:18:16 +00:00
committed by Gerrit Code Review
parent 79b0eef5a1 d447bbbae5
commit 79035fa842
1 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
java/dex.go
View File

@@ -180,7 +180,7 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
"$r8Template": &remoteexec.REParams{ "$r8Template": &remoteexec.REParams{
Labels: map[string]string{"type": "compile", "compiler": "r8"}, Labels: map[string]string{"type": "compile", "compiler": "r8"},
Inputs: []string{"$implicits", "${config.R8Jar}"}, Inputs: []string{"$implicits", "${config.R8Jar}"},
OutputFiles: []string{"${outUsage}", "${outConfig}", "${outDict}", "${resourcesOutput}"}, OutputFiles: []string{"${outUsage}", "${outConfig}", "${outDict}", "${resourcesOutput}", "${outR8ArtProfile}"},
ExecStrategy: "${config.RER8ExecStrategy}", ExecStrategy: "${config.RER8ExecStrategy}",
ToolchainInputs: []string{"${config.JavaCmd}"}, ToolchainInputs: []string{"${config.JavaCmd}"},
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
@@ -200,7 +200,7 @@ var r8, r8RE = pctx.MultiCommandRemoteStaticRules("r8",
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
}, },
}, []string{"outDir", "outDict", "outConfig", "outUsage", "outUsageZip", "outUsageDir", }, []string{"outDir", "outDict", "outConfig", "outUsage", "outUsageZip", "outUsageDir",
"r8Flags", "zipFlags", "mergeZipsFlags", "resourcesOutput"}, []string{"implicits"}) "r8Flags", "zipFlags", "mergeZipsFlags", "resourcesOutput", "outR8ArtProfile"}, []string{"implicits"})
func (d *dexer) dexCommonFlags(ctx android.ModuleContext, func (d *dexer) dexCommonFlags(ctx android.ModuleContext,
dexParams *compileDexParams) (flags []string, deps android.Paths) { dexParams *compileDexParams) (flags []string, deps android.Paths) {
@@ -463,13 +463,6 @@ func (d *dexer) compileDex(ctx android.ModuleContext, dexParams *compileDexParam
proguardConfiguration, proguardConfiguration,
} }
r8Flags, r8Deps, r8ArtProfileOutputPath := d.r8Flags(ctx, dexParams) r8Flags, r8Deps, r8ArtProfileOutputPath := d.r8Flags(ctx, dexParams)
if r8ArtProfileOutputPath != nil {
artProfileOutputPath = r8ArtProfileOutputPath
implicitOutputs = append(
implicitOutputs,
artProfileOutputPath,
)
}
rule := r8 rule := r8
args := map[string]string{ args := map[string]string{
"r8Flags": strings.Join(append(commonFlags, r8Flags...), " "), "r8Flags": strings.Join(append(commonFlags, r8Flags...), " "),
@@ -482,6 +475,17 @@ func (d *dexer) compileDex(ctx android.ModuleContext, dexParams *compileDexParam
"outDir": outDir.String(), "outDir": outDir.String(),
"mergeZipsFlags": mergeZipsFlags, "mergeZipsFlags": mergeZipsFlags,
} }
if r8ArtProfileOutputPath != nil {
artProfileOutputPath = r8ArtProfileOutputPath
implicitOutputs = append(
implicitOutputs,
artProfileOutputPath,
)
// Add the implicit r8 Art profile output to args so that r8RE knows
// about this implicit output
args["outR8ArtProfile"] = artProfileOutputPath.String()
}
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_R8") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_R8") {
rule = r8RE rule = r8RE
args["implicits"] = strings.Join(r8Deps.Strings(), ",") args["implicits"] = strings.Join(r8Deps.Strings(), ",")