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

Merge "For mixed build bazel actions, remove old outputs" am: e1bb74e724

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/1834860

Change-Id: I32be5f8098a6161aad6d2bdabfb848fd374eeed1
This commit is contained in:
Treehugger Robot
2021-09-23 22:48:05 +00:00
committed by Automerger Merge Worker
parent 8cbd0f5575 e1bb74e724
commit d17a3ad9f2
1 changed files with 10 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
android/bazel_handler.go
View File

@@ -809,7 +809,16 @@ func (c *bazelSingleton) GenerateBuildActions(ctx SingletonContext) {
cmd := rule.Command() cmd := rule.Command()
// cd into Bazel's execution root, which is the action cwd. // cd into Bazel's execution root, which is the action cwd.
cmd.Text(fmt.Sprintf("cd %s/execroot/__main__ && ", ctx.Config().BazelContext.OutputBase())) cmd.Text(fmt.Sprintf("cd %s/execroot/__main__ &&", ctx.Config().BazelContext.OutputBase()))
// Remove old outputs, as some actions might not rerun if the outputs are detected.
if len(buildStatement.OutputPaths) > 0 {
cmd.Text("rm -f")
for _, outputPath := range buildStatement.OutputPaths {
cmd.Text(PathForBazelOut(ctx, outputPath).String())
}
cmd.Text("&&")
}
for _, pair := range buildStatement.Env { for _, pair := range buildStatement.Env {
// Set per-action env variables, if any. // Set per-action env variables, if any.