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

Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c am: a510a2db10

Browse source 
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15776183

Change-Id: Ie310a0529d5c3c90f5dba61ddc736edd4569ee13
This commit is contained in:
Kousik Kumar 2021-09-09 19:17:37 +00:00 committed by Automerger Merge Worker
commit b24137e0cf
3 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
cc/builder.go
View file

@ -584,7 +584,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and
sAbiDumpFiles = append(sAbiDumpFiles, sAbiDumpFile) sAbiDumpFiles = append(sAbiDumpFiles, sAbiDumpFile)
dumpRule := sAbiDump dumpRule := sAbiDump
if ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") {
dumpRule = sAbiDumpRE dumpRule = sAbiDumpRE
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
@ -700,7 +700,7 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext,
"ldFlags": flags.globalLdFlags + " " + flags.localLdFlags, "ldFlags": flags.globalLdFlags + " " + flags.localLdFlags,
"crtEnd": crtEnd.String(), "crtEnd": crtEnd.String(),
} }
if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
rule = ldRE rule = ldRE
args["implicitOutputs"] = strings.Join(implicitOutputs.Strings(), ",") args["implicitOutputs"] = strings.Join(implicitOutputs.Strings(), ",")
args["implicitInputs"] = strings.Join(deps.Strings(), ",") args["implicitInputs"] = strings.Join(deps.Strings(), ",")
@ -858,7 +858,7 @@ func TransformObjsToObj(ctx android.ModuleContext, objFiles android.Paths,
"ldCmd": ldCmd, "ldCmd": ldCmd,
"ldFlags": flags.globalLdFlags + " " + flags.localLdFlags, "ldFlags": flags.globalLdFlags + " " + flags.localLdFlags,
} }
if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") {
rule = partialLdRE rule = partialLdRE
args["inCommaList"] = strings.Join(objFiles.Strings(), ",") args["inCommaList"] = strings.Join(objFiles.Strings(), ",")
args["implicitInputs"] = strings.Join(deps.Strings(), ",") args["implicitInputs"] = strings.Join(deps.Strings(), ",")

2
java/builder.go
View file

@ -452,7 +452,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab
annoDir = filepath.Join(shardDir, annoDir) annoDir = filepath.Join(shardDir, annoDir)
} }
rule := javac rule := javac
if ctx.Config().IsEnvTrue("RBE_JAVAC") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") {
rule = javacRE rule = javacRE
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{

4
java/dex.go
View file

@ -222,7 +222,7 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
"outDict": j.proguardDictionary.String(), "outDict": j.proguardDictionary.String(),
"outDir": outDir.String(), "outDir": outDir.String(),
} }
if 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(), ",")
} }
@ -238,7 +238,7 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
} else { } else {
d8Flags, d8Deps := j.d8Flags(ctx, flags) d8Flags, d8Deps := j.d8Flags(ctx, flags)
rule := d8 rule := d8
if ctx.Config().IsEnvTrue("RBE_D8") { if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_D8") {
rule = d8RE rule = d8RE
} }
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{