Refactor RBE support for Javac/R8/D8 to use the remoteexec package.
Bug: b/156613606 Test: build with and without RBE_JAVAC/RBE_R8/RBE_D8 set. Change-Id: I1607f8cfb4d2c3cbb3672152bbeb561d9968bc60 Merged-In: I1607f8cfb4d2c3cbb3672152bbeb561d9968bc60
This commit is contained in:
Treehugger Robot
committed by
Ramy Medhat
Ramy Medhat
parent
88ef9fb76e
commit
ac80afa642
@@ -27,6 +27,7 @@ import (
|
||||
"github.com/google/blueprint/proptools"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/remoteexec"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -38,12 +39,13 @@ var (
|
||||
// this, all java rules write into separate directories and then are combined into a .jar file
|
||||
// (if the rule produces .class files) or a .srcjar file (if the rule produces .java files).
|
||||
// .srcjar files are unzipped into a temporary directory when compiled with javac.
|
||||
javac = pctx.AndroidRemoteStaticRule("javac", android.RemoteRuleSupports{Goma: true, RBE: true, RBEFlag: android.RBE_JAVAC},
|
||||
// TODO(b/143658984): goma can't handle the --system argument to javac.
|
||||
javac, javacRE = remoteexec.StaticRules(pctx, "javac",
|
||||
blueprint.RuleParams{
|
||||
Command: `rm -rf "$outDir" "$annoDir" "$srcJarDir" && mkdir -p "$outDir" "$annoDir" "$srcJarDir" && ` +
|
||||
`${config.ZipSyncCmd} -d $srcJarDir -l $srcJarDir/list -f "*.java" $srcJars && ` +
|
||||
`(if [ -s $srcJarDir/list ] || [ -s $out.rsp ] ; then ` +
|
||||
`${config.SoongJavacWrapper} ${config.JavacWrapper}${config.JavacCmd} ` +
|
||||
`${config.SoongJavacWrapper} $reTemplate${config.JavacCmd} ` +
|
||||
`${config.JavacHeapFlags} ${config.JavacVmFlags} ${config.CommonJdkFlags} ` +
|
||||
`$processorpath $processor $javacFlags $bootClasspath $classpath ` +
|
||||
`-source $javaVersion -target $javaVersion ` +
|
||||
@@ -58,9 +60,12 @@ var (
|
||||
CommandOrderOnly: []string{"${config.SoongJavacWrapper}"},
|
||||
Rspfile: "$out.rsp",
|
||||
RspfileContent: "$in",
|
||||
},
|
||||
"javacFlags", "bootClasspath", "classpath", "processorpath", "processor", "srcJars", "srcJarDir",
|
||||
"outDir", "annoDir", "javaVersion")
|
||||
}, &remoteexec.REParams{
|
||||
Labels: map[string]string{"type": "compile", "lang": "java", "compiler": "javac"},
|
||||
ExecStrategy: "${config.REJavacExecStrategy}",
|
||||
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
|
||||
}, []string{"javacFlags", "bootClasspath", "classpath", "processorpath", "processor", "srcJars", "srcJarDir",
|
||||
"outDir", "annoDir", "javaVersion"}, nil)
|
||||
|
||||
_ = pctx.VariableFunc("kytheCorpus",
|
||||
func(ctx android.PackageVarContext) string { return ctx.Config().XrefCorpusName() })
|
||||
@@ -199,6 +204,7 @@ var (
|
||||
func init() {
|
||||
pctx.Import("android/soong/android")
|
||||
pctx.Import("android/soong/java/config")
|
||||
pctx.Import("android/soong/remoteexec")
|
||||
}
|
||||
|
||||
type javaBuilderFlags struct {
|
||||
@@ -409,8 +415,12 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab
|
||||
outDir = filepath.Join(shardDir, outDir)
|
||||
annoDir = filepath.Join(shardDir, annoDir)
|
||||
}
|
||||
rule := javac
|
||||
if ctx.Config().IsEnvTrue("RBE_JAVAC") {
|
||||
rule = javacRE
|
||||
}
|
||||
ctx.Build(pctx, android.BuildParams{
|
||||
Rule: javac,
|
||||
Rule: rule,
|
||||
Description: desc,
|
||||
Output: outputFile,
|
||||
Inputs: srcFiles,
|
||||
|
||||
@@ -22,6 +22,7 @@ import (
|
||||
_ "github.com/google/blueprint/bootstrap"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/remoteexec"
|
||||
)
|
||||
|
||||
var (
|
||||
@@ -139,30 +140,16 @@ func init() {
|
||||
pctx.HostJavaToolVariable("MetalavaJar", "metalava.jar")
|
||||
pctx.HostJavaToolVariable("DokkaJar", "dokka.jar")
|
||||
pctx.HostJavaToolVariable("JetifierJar", "jetifier.jar")
|
||||
pctx.HostJavaToolVariable("R8Jar", "r8-compat-proguard.jar")
|
||||
pctx.HostJavaToolVariable("D8Jar", "d8.jar")
|
||||
|
||||
pctx.HostBinToolVariable("SoongJavacWrapper", "soong_javac_wrapper")
|
||||
pctx.HostBinToolVariable("DexpreoptGen", "dexpreopt_gen")
|
||||
|
||||
pctx.VariableFunc("JavacWrapper", func(ctx android.PackageVarContext) string {
|
||||
if override := ctx.Config().Getenv("JAVAC_WRAPPER"); override != "" {
|
||||
return override + " "
|
||||
}
|
||||
return ""
|
||||
})
|
||||
|
||||
pctx.VariableFunc("R8Wrapper", func(ctx android.PackageVarContext) string {
|
||||
if override := ctx.Config().Getenv("R8_WRAPPER"); override != "" {
|
||||
return override + " "
|
||||
}
|
||||
return ""
|
||||
})
|
||||
|
||||
pctx.VariableFunc("D8Wrapper", func(ctx android.PackageVarContext) string {
|
||||
if override := ctx.Config().Getenv("D8_WRAPPER"); override != "" {
|
||||
return override + " "
|
||||
}
|
||||
return ""
|
||||
})
|
||||
pctx.VariableFunc("REJavaPool", remoteexec.EnvOverrideFunc("RBE_JAVA_POOL", "java16"))
|
||||
pctx.VariableFunc("REJavacExecStrategy", remoteexec.EnvOverrideFunc("RBE_JAVAC_EXEC_STRATEGY", remoteexec.LocalExecStrategy))
|
||||
pctx.VariableFunc("RED8ExecStrategy", remoteexec.EnvOverrideFunc("RBE_D8_EXEC_STRATEGY", remoteexec.LocalExecStrategy))
|
||||
pctx.VariableFunc("RER8ExecStrategy", remoteexec.EnvOverrideFunc("RBE_R8_EXEC_STRATEGY", remoteexec.LocalExecStrategy))
|
||||
|
||||
pctx.HostJavaToolVariable("JacocoCLIJar", "jacoco-cli.jar")
|
||||
|
||||
|
||||
53
java/dex.go
53
java/dex.go
@@ -20,12 +20,13 @@ import (
|
||||
"github.com/google/blueprint"
|
||||
|
||||
"android/soong/android"
|
||||
"android/soong/remoteexec"
|
||||
)
|
||||
|
||||
var d8 = pctx.AndroidRemoteStaticRule("d8", android.RemoteRuleSupports{RBE: true, RBEFlag: android.RBE_D8},
|
||||
var d8, d8RE = remoteexec.StaticRules(pctx, "d8",
|
||||
blueprint.RuleParams{
|
||||
Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
|
||||
`${config.D8Wrapper}${config.D8Cmd} ${config.DexFlags} --output $outDir $d8Flags $in && ` +
|
||||
`$reTemplate${config.D8Cmd} ${config.DexFlags} --output $outDir $d8Flags $in && ` +
|
||||
`${config.SoongZipCmd} $zipFlags -o $outDir/classes.dex.jar -C $outDir -f "$outDir/classes*.dex" && ` +
|
||||
`${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`,
|
||||
CommandDeps: []string{
|
||||
@@ -33,14 +34,19 @@ var d8 = pctx.AndroidRemoteStaticRule("d8", android.RemoteRuleSupports{RBE: true
|
||||
"${config.SoongZipCmd}",
|
||||
"${config.MergeZipsCmd}",
|
||||
},
|
||||
},
|
||||
"outDir", "d8Flags", "zipFlags")
|
||||
}, &remoteexec.REParams{
|
||||
Labels: map[string]string{"type": "compile", "compiler": "d8"},
|
||||
Inputs: []string{"${config.D8Jar}"},
|
||||
ExecStrategy: "${config.RED8ExecStrategy}",
|
||||
ToolchainInputs: []string{"${config.JavaCmd}"},
|
||||
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
|
||||
}, []string{"outDir", "d8Flags", "zipFlags"}, nil)
|
||||
|
||||
var r8 = pctx.AndroidRemoteStaticRule("r8", android.RemoteRuleSupports{RBE: true, RBEFlag: android.RBE_R8},
|
||||
var r8, r8RE = remoteexec.StaticRules(pctx, "r8",
|
||||
blueprint.RuleParams{
|
||||
Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
|
||||
`rm -f "$outDict" && ` +
|
||||
`${config.R8Wrapper}${config.R8Cmd} ${config.DexFlags} -injars $in --output $outDir ` +
|
||||
`$reTemplate${config.R8Cmd} ${config.DexFlags} -injars $in --output $outDir ` +
|
||||
`--force-proguard-compatibility ` +
|
||||
`--no-data-resources ` +
|
||||
`-printmapping $outDict ` +
|
||||
@@ -53,8 +59,13 @@ var r8 = pctx.AndroidRemoteStaticRule("r8", android.RemoteRuleSupports{RBE: true
|
||||
"${config.SoongZipCmd}",
|
||||
"${config.MergeZipsCmd}",
|
||||
},
|
||||
},
|
||||
"outDir", "outDict", "r8Flags", "zipFlags")
|
||||
}, &remoteexec.REParams{
|
||||
Labels: map[string]string{"type": "compile", "compiler": "r8"},
|
||||
Inputs: []string{"$implicits", "${config.R8Jar}"},
|
||||
ExecStrategy: "${config.RER8ExecStrategy}",
|
||||
ToolchainInputs: []string{"${config.JavaCmd}"},
|
||||
Platform: map[string]string{remoteexec.PoolKey: "${config.REJavaPool}"},
|
||||
}, []string{"outDir", "outDict", "r8Flags", "zipFlags"}, []string{"implicits"})
|
||||
|
||||
func (j *Module) dexCommonFlags(ctx android.ModuleContext) []string {
|
||||
flags := j.deviceProperties.Dxflags
|
||||
@@ -185,24 +196,34 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
|
||||
proguardDictionary := android.PathForModuleOut(ctx, "proguard_dictionary")
|
||||
j.proguardDictionary = proguardDictionary
|
||||
r8Flags, r8Deps := j.r8Flags(ctx, flags)
|
||||
rule := r8
|
||||
args := map[string]string{
|
||||
"r8Flags": strings.Join(r8Flags, " "),
|
||||
"zipFlags": zipFlags,
|
||||
"outDict": j.proguardDictionary.String(),
|
||||
"outDir": outDir.String(),
|
||||
}
|
||||
if ctx.Config().IsEnvTrue("RBE_R8") {
|
||||
rule = r8RE
|
||||
args["implicits"] = strings.Join(r8Deps.Strings(), ",")
|
||||
}
|
||||
ctx.Build(pctx, android.BuildParams{
|
||||
Rule: r8,
|
||||
Rule: rule,
|
||||
Description: "r8",
|
||||
Output: javalibJar,
|
||||
ImplicitOutput: proguardDictionary,
|
||||
Input: classesJar,
|
||||
Implicits: r8Deps,
|
||||
Args: map[string]string{
|
||||
"r8Flags": strings.Join(r8Flags, " "),
|
||||
"zipFlags": zipFlags,
|
||||
"outDict": j.proguardDictionary.String(),
|
||||
"outDir": outDir.String(),
|
||||
},
|
||||
Args: args,
|
||||
})
|
||||
} else {
|
||||
d8Flags, d8Deps := j.d8Flags(ctx, flags)
|
||||
rule := d8
|
||||
if ctx.Config().IsEnvTrue("RBE_D8") {
|
||||
rule = d8RE
|
||||
}
|
||||
ctx.Build(pctx, android.BuildParams{
|
||||
Rule: d8,
|
||||
Rule: rule,
|
||||
Description: "d8",
|
||||
Output: javalibJar,
|
||||
Input: classesJar,
|
||||
|
||||
Reference in New Issue
Block a user