diff options
| author | Kousik Kumar <kousikk@google.com> | 2021-09-07 14:47:21 +0000 |
|---|---|---|
| committer | Kousik Kumar <kousikk@google.com> | 2021-09-07 15:20:50 +0000 |
| commit | a510a2db107e15b7f413f3ee6e7d4fe8a70e7a55 (patch) | |
| tree | 0a17310e3798b5381e33cd97fada3750e8ec8f00 | |
| parent | 4e88859af01376b9977bcc03174c182353c172d4 (diff) | |
| parent | e78212a55c4742169d788f5c5b9ae9001b95da2e (diff) | |
| download | soong-a510a2db107e15b7f413f3ee6e7d4fe8a70e7a55.tar.gz | |
Resolve merge conflicts of "Check UseRBE is set before replacing any template with the RE version." am: 3e0b9c031c am: 4e2977ee81 am: e78212a55c
Original change: https://googleplex-android-review.googlesource.com/c/platform/build/soong/+/15747538
Bug: b/198045383
Merged-In: I6df58b4e700f0d231367af2710672d731d20a736
Change-Id: Ide5966e039ae5232438946fa064d8621088bc1ee
| -rw-r--r-- | cc/builder.go | 6 | ||||
| -rw-r--r-- | java/builder.go | 2 | ||||
| -rw-r--r-- | java/dex.go | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/cc/builder.go b/cc/builder.go index 5deb1299e..7b66b102f 100644 --- a/cc/builder.go +++ b/cc/builder.go @@ -584,7 +584,7 @@ func TransformSourceToObj(ctx android.ModuleContext, subdir string, srcFiles and sAbiDumpFiles = append(sAbiDumpFiles, sAbiDumpFile) dumpRule := sAbiDump - if ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_ABI_DUMPER") { dumpRule = sAbiDumpRE } ctx.Build(pctx, android.BuildParams{ @@ -700,7 +700,7 @@ func TransformObjToDynamicBinary(ctx android.ModuleContext, "ldFlags": flags.globalLdFlags + " " + flags.localLdFlags, "crtEnd": crtEnd.String(), } - if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { rule = ldRE args["implicitOutputs"] = strings.Join(implicitOutputs.Strings(), ",") args["implicitInputs"] = strings.Join(deps.Strings(), ",") @@ -858,7 +858,7 @@ func TransformObjsToObj(ctx android.ModuleContext, objFiles android.Paths, "ldCmd": ldCmd, "ldFlags": flags.globalLdFlags + " " + flags.localLdFlags, } - if ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_CXX_LINKS") { rule = partialLdRE args["inCommaList"] = strings.Join(objFiles.Strings(), ",") args["implicitInputs"] = strings.Join(deps.Strings(), ",") diff --git a/java/builder.go b/java/builder.go index 7318fcbad..53f08101b 100644 --- a/java/builder.go +++ b/java/builder.go @@ -452,7 +452,7 @@ func transformJavaToClasses(ctx android.ModuleContext, outputFile android.Writab annoDir = filepath.Join(shardDir, annoDir) } rule := javac - if ctx.Config().IsEnvTrue("RBE_JAVAC") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_JAVAC") { rule = javacRE } ctx.Build(pctx, android.BuildParams{ diff --git a/java/dex.go b/java/dex.go index 9e61e95ad..10db1d333 100644 --- a/java/dex.go +++ b/java/dex.go @@ -222,7 +222,7 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, "outDict": j.proguardDictionary.String(), "outDir": outDir.String(), } - if ctx.Config().IsEnvTrue("RBE_R8") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_R8") { rule = r8RE args["implicits"] = strings.Join(r8Deps.Strings(), ",") } @@ -238,7 +238,7 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags, } else { d8Flags, d8Deps := j.d8Flags(ctx, flags) rule := d8 - if ctx.Config().IsEnvTrue("RBE_D8") { + if ctx.Config().UseRBE() && ctx.Config().IsEnvTrue("RBE_D8") { rule = d8RE } ctx.Build(pctx, android.BuildParams{ |