Rework rule building in bliss_generator
Signed-off-by: SagarMakhar <sagarmakhar@gmail.com>
Signed-off-by: Arian <arian.kulmer@web.de>
Change-Id: I05c36b8660e51a18ac70a6712b2d03edfc561156
diff --git a/build/soong/generator/generator.go b/build/soong/generator/generator.go
index 61b1384..74910a3 100644
--- a/build/soong/generator/generator.go
+++ b/build/soong/generator/generator.go
@@ -1,5 +1,5 @@
// Copyright 2015 Google Inc. All rights reserved.
-// Copyright (C) 2018 The LineageOS Project
+// Copyright (C) 2018,2021 The LineageOS Project
//
// Licensed under the Apache License, Version 2.0 (the "License");
// you may not use this file except in compliance with the License.
@@ -24,7 +24,6 @@
"github.com/google/blueprint/proptools"
"android/soong/android"
- "android/soong/shared"
"path/filepath"
)
@@ -245,7 +244,7 @@
return tools[toolFiles[0].Rel()].String(), nil
}
case "genDir":
- return "__SBOX_OUT_DIR__", nil
+ return android.PathForModuleGen(ctx).String(), nil
default:
if strings.HasPrefix(name, "location ") {
label := strings.TrimSpace(strings.TrimPrefix(name, "location "))
@@ -267,33 +266,22 @@
// Dummy output dep
dummyDep := android.PathForModuleGen(ctx, ".dummy_dep")
- // tell the sbox command which directory to use as its sandbox root
- buildDir := android.PathForOutput(ctx).String()
- sandboxPath := shared.TempDirForOutDir(buildDir)
-
+ buildDir := android.PathForOutput(ctx, "generator")
genDir := android.PathForModuleGen(ctx)
- // Escape the command for the shell
- rawCommand = "'" + strings.Replace(rawCommand, "'", `'\''`, -1) + "'"
- sandboxCommand := fmt.Sprintf("$sboxCmd --sandbox-path %s --output-root %s --copy-all-output -c %s && touch %s",
- sandboxPath, genDir, rawCommand, dummyDep.String())
- ruleParams := blueprint.RuleParams{
- Command: sandboxCommand,
- CommandDeps: []string{"$sboxCmd"},
- }
- g.rule = ctx.Rule(pctx, "generator", ruleParams)
+ // Use a RuleBuilder to create a rule that runs the command inside an sbox sandbox.
+ rule := android.NewRuleBuilder(pctx, ctx).Sbox(genDir, buildDir).SandboxTools()
- params := android.BuildParams{
- Rule: g.rule,
- Description: "generate",
- Output: dummyDep,
- Inputs: g.inputDeps,
- Implicits: g.implicitDeps,
- }
+ rule.Command().
+ Text(rawCommand).
+ ImplicitOutput(dummyDep).
+ Implicits(g.inputDeps).
+ Implicits(g.implicitDeps)
+ rule.Command().Text("touch").Output(dummyDep)
g.outputDeps = append(g.outputDeps, dummyDep)
- ctx.Build(pctx, params)
+ rule.Build("generator", "generate")
}
func NewGenerator() *Module {