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

Ensure outputs correctly declared for proguard config in R8

Browse Source 
Bug: 281081834
Test: manually inspect the file
Change-Id: Iaa8a99f1f1ae62b853e2a8dad613c2c6c886ff48
This commit is contained in:
Rico Wind
2023-05-12 12:30:07 +02:00
parent 494fca1328
commit b565f2f0df
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
java/dex.go
View File

@@ -161,7 +161,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}"}, OutputFiles: []string{"${outUsage}", "${outConfig}", "${outDict}"},
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}"},
@@ -399,13 +399,16 @@ func (d *dexer) compileDex(ctx android.ModuleContext, dexParams *compileDexParam
args["implicits"] = strings.Join(r8Deps.Strings(), ",") args["implicits"] = strings.Join(r8Deps.Strings(), ",")
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rule, Rule: rule,
Description: "r8", Description: "r8",
Output: javalibJar, Output: javalibJar,
ImplicitOutputs: android.WritablePaths{proguardDictionary, proguardUsageZip}, ImplicitOutputs: android.WritablePaths{
Input: dexParams.classesJar, proguardDictionary,
Implicits: r8Deps, proguardUsageZip,
Args: args, proguardConfiguration},
Input: dexParams.classesJar,
Implicits: r8Deps,
Args: args,
}) })
} else { } else {
d8Flags, d8Deps := d8Flags(dexParams.flags) d8Flags, d8Deps := d8Flags(dexParams.flags)