tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Revert "Add the implicit deps of javacRE"" into main

Browse source
This commit is contained in:
Spandan Das 2024-04-11 16:53:12 +00:00 committed by Gerrit Code Review
commit d5b05655bb
1 changed files with 14 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
java/builder.go
View file

@ -19,7 +19,6 @@ package java
// functions. // functions.
import ( import (
"fmt"
"path/filepath" "path/filepath"
"strconv" "strconv"
"strings" "strings"
@ -69,8 +68,6 @@ var (
}, map[string]*remoteexec.REParams{ }, map[string]*remoteexec.REParams{
"$javaTemplate": &remoteexec.REParams{ "$javaTemplate": &remoteexec.REParams{
Labels: map[string]string{"type": "compile", "lang": "java", "compiler": "javac"}, Labels: map[string]string{"type": "compile", "lang": "java", "compiler": "javac"},
Inputs: []string{"${config.JavacCmd}"},
RSPFiles: []string{"${out}.rsp", "${javacREClasspathDeps}"},
ExecStrategy: "${config.REJavacExecStrategy}", ExecStrategy: "${config.REJavacExecStrategy}",
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
}, },
@ -89,7 +86,7 @@ var (
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"}, Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
}, },
}, []string{"javacFlags", "bootClasspath", "classpath", "processorpath", "processor", "srcJars", "srcJarDir", }, []string{"javacFlags", "bootClasspath", "classpath", "processorpath", "processor", "srcJars", "srcJarDir",
"outDir", "annoDir", "annoSrcJar", "javaVersion"}, []string{"javacREClasspathDeps"}) "outDir", "annoDir", "annoSrcJar", "javaVersion"}, nil)
_ = pctx.VariableFunc("kytheCorpus", _ = pctx.VariableFunc("kytheCorpus",
func(ctx android.PackageVarContext) string { return ctx.Config().XrefCorpusName() }) func(ctx android.PackageVarContext) string { return ctx.Config().XrefCorpusName() })
@ -604,35 +601,8 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab
annoDir = filepath.Join(shardDir, annoDir) annoDir = filepath.Join(shardDir, annoDir)
} }
rule := javac rule := javac
args := map[string]string{
"javacFlags": flags.javacFlags,
"bootClasspath": bootClasspath,
"classpath": classpathArg,
"processorpath": flags.processorPath.FormJavaClassPath("-processorpath"),
"processor": processor,
"srcJars": strings.Join(srcJars.Strings(), " "),
"srcJarDir": android.PathForModuleOut(ctx, intermediatesDir, srcJarDir).String(),
"outDir": android.PathForModuleOut(ctx, intermediatesDir, outDir).String(),
"annoDir": android.PathForModuleOut(ctx, intermediatesDir, annoDir).String(),
"annoSrcJar": annoSrcJar.String(),
"javaVersion": flags.javaVersion.String(),
}
if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") {
rule = javacRE rule = javacRE
// Write the classpath deps to a file that can be passed as an input to javacRE.
// Skip the shardIdx if the java library is unsharded
shardIdxSuffix := strconv.Itoa(shardIdx)
if shardIdx == -1 {
shardIdxSuffix = ""
}
javacREClasspathDepsFile := outputFile.ReplaceExtension(ctx, fmt.Sprintf("javacre.classpathdeps%v", shardIdxSuffix))
android.WriteFileRule(ctx, javacREClasspathDepsFile, strings.Join(javacClasspath.Strings(), ",")) // The classpath jars are an implicit dep of javacRE
args["javacREClasspathDeps"] = javacREClasspathDepsFile.String()
// Add the deps file to the implicit inputs
deps = append(deps, javacREClasspathDepsFile)
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: rule, Rule: rule,
@ -641,7 +611,19 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab
ImplicitOutput: annoSrcJar, ImplicitOutput: annoSrcJar,
Inputs: srcFiles, Inputs: srcFiles,
Implicits: deps, Implicits: deps,
Args: args, Args: map[string]string{
"javacFlags": flags.javacFlags,
"bootClasspath": bootClasspath,
"classpath": classpathArg,
"processorpath": flags.processorPath.FormJavaClassPath("-processorpath"),
"processor": processor,
"srcJars": strings.Join(srcJars.Strings(), " "),
"srcJarDir": android.PathForModuleOut(ctx, intermediatesDir, srcJarDir).String(),
"outDir": android.PathForModuleOut(ctx, intermediatesDir, outDir).String(),
"annoDir": android.PathForModuleOut(ctx, intermediatesDir, annoDir).String(),
"annoSrcJar": annoSrcJar.String(),
"javaVersion": flags.javaVersion.String(),
},
}) })
} }