Fix bug in RuleBuilderCommand.OrderOnlys
Order only dependencies that were added to a RuleBuilderCommand were
only propagated to the rule that was created for a missing dependencies
error. Set them on the main rule instead.
Test: TestRuleBuilder_build
Change-Id: I049d1bb921778d18d678439d236f69081927dc70
diff --git a/android/rule_builder_test.go b/android/rule_builder_test.go
index d2a7d8d..24c8976 100644
--- a/android/rule_builder_test.go
+++ b/android/rule_builder_test.go
@@ -15,6 +15,8 @@
package android
import (
+ "crypto/sha256"
+ "encoding/hex"
"fmt"
"path/filepath"
"regexp"
@@ -497,6 +499,8 @@
func (t *testRuleBuilderModule) GenerateAndroidBuildActions(ctx ModuleContext) {
in := PathsForSource(ctx, t.properties.Srcs)
+ implicit := PathForSource(ctx, "implicit")
+ orderOnly := PathForSource(ctx, "orderonly")
out := PathForModuleOut(ctx, "gen", ctx.ModuleName())
outDep := PathForModuleOut(ctx, "gen", ctx.ModuleName()+".d")
outDir := PathForModuleOut(ctx, "gen")
@@ -506,9 +510,9 @@
rspFileContents2 := PathsForSource(ctx, []string{"rsp_in2"})
manifestPath := PathForModuleOut(ctx, "sbox.textproto")
- testRuleBuilder_Build(ctx, in, out, outDep, outDir, manifestPath, t.properties.Restat,
- t.properties.Sbox, t.properties.Sbox_inputs, rspFile, rspFileContents,
- rspFile2, rspFileContents2)
+ testRuleBuilder_Build(ctx, in, implicit, orderOnly, out, outDep, outDir,
+ manifestPath, t.properties.Restat, t.properties.Sbox, t.properties.Sbox_inputs,
+ rspFile, rspFileContents, rspFile2, rspFileContents2)
}
type testRuleBuilderSingleton struct{}
@@ -518,7 +522,9 @@
}
func (t *testRuleBuilderSingleton) GenerateBuildActions(ctx SingletonContext) {
- in := PathForSource(ctx, "bar")
+ in := PathsForSource(ctx, []string{"in"})
+ implicit := PathForSource(ctx, "implicit")
+ orderOnly := PathForSource(ctx, "orderonly")
out := PathForOutput(ctx, "singleton/gen/baz")
outDep := PathForOutput(ctx, "singleton/gen/baz.d")
outDir := PathForOutput(ctx, "singleton/gen")
@@ -527,11 +533,14 @@
rspFileContents := PathsForSource(ctx, []string{"rsp_in"})
rspFileContents2 := PathsForSource(ctx, []string{"rsp_in2"})
manifestPath := PathForOutput(ctx, "singleton/sbox.textproto")
- testRuleBuilder_Build(ctx, Paths{in}, out, outDep, outDir, manifestPath, true, false, false,
+
+ testRuleBuilder_Build(ctx, in, implicit, orderOnly, out, outDep, outDir,
+ manifestPath, true, false, false,
rspFile, rspFileContents, rspFile2, rspFileContents2)
}
-func testRuleBuilder_Build(ctx BuilderContext, in Paths, out, outDep, outDir, manifestPath WritablePath,
+func testRuleBuilder_Build(ctx BuilderContext, in Paths, implicit, orderOnly Path,
+ out, outDep, outDir, manifestPath WritablePath,
restat, sbox, sboxInputs bool,
rspFile WritablePath, rspFileContents Paths, rspFile2 WritablePath, rspFileContents2 Paths) {
@@ -547,6 +556,8 @@
rule.Command().
Tool(PathForSource(ctx, "cp")).
Inputs(in).
+ Implicit(implicit).
+ OrderOnly(orderOnly).
Output(out).
ImplicitDepFile(outDep).
FlagWithRspFileInputList("@", rspFile, rspFileContents).
@@ -566,24 +577,24 @@
func TestRuleBuilder_Build(t *testing.T) {
fs := MockFS{
- "bar": nil,
- "cp": nil,
+ "in": nil,
+ "cp": nil,
}
bp := `
rule_builder_test {
name: "foo",
- srcs: ["bar"],
+ srcs: ["in"],
restat: true,
}
rule_builder_test {
name: "foo_sbox",
- srcs: ["bar"],
+ srcs: ["in"],
sbox: true,
}
rule_builder_test {
name: "foo_sbox_inputs",
- srcs: ["bar"],
+ srcs: ["in"],
sbox: true,
sbox_inputs: true,
}
@@ -614,11 +625,14 @@
wantInputs := []string{"rsp_in"}
AssertArrayString(t, "Inputs", wantInputs, params.Inputs.Strings())
- wantImplicits := append([]string{"bar"}, extraImplicits...)
+ wantImplicits := append([]string{"implicit", "in"}, extraImplicits...)
// The second rsp file and the files listed in it should be in implicits
wantImplicits = append(wantImplicits, "rsp_in2", wantRspFile2)
AssertPathsRelativeToTopEquals(t, "Implicits", wantImplicits, params.Implicits)
+ wantOrderOnlys := []string{"orderonly"}
+ AssertPathsRelativeToTopEquals(t, "OrderOnly", wantOrderOnlys, params.OrderOnly)
+
wantRspFileContent := "$in"
AssertStringEquals(t, "RspfileContent", wantRspFileContent, params.RuleParams.RspfileContent)
@@ -646,7 +660,7 @@
rspFile2 := "out/soong/.intermediates/foo/rsp2"
module := result.ModuleForTests("foo", "")
check(t, module.Rule("rule"), module.Output(rspFile2),
- "cp bar "+outFile+" @"+rspFile+" @"+rspFile2,
+ "cp in "+outFile+" @"+rspFile+" @"+rspFile2,
outFile, outFile+".d", rspFile, rspFile2, true, nil, nil)
})
t.Run("sbox", func(t *testing.T) {
@@ -688,7 +702,7 @@
rspFile2 := filepath.Join("out/soong/singleton/rsp2")
singleton := result.SingletonForTests("rule_builder_test")
check(t, singleton.Rule("rule"), singleton.Output(rspFile2),
- "cp bar "+outFile+" @"+rspFile+" @"+rspFile2,
+ "cp in "+outFile+" @"+rspFile+" @"+rspFile2,
outFile, outFile+".d", rspFile, rspFile2, true, nil, nil)
})
}
@@ -702,6 +716,11 @@
// the list of inputs changes because the command line or a dependency
// changes.
+ hashOf := func(s string) string {
+ sum := sha256.Sum256([]byte(s))
+ return hex.EncodeToString(sum[:])
+ }
+
bp := `
rule_builder_test {
name: "hash0",
@@ -727,14 +746,12 @@
expectedHash string
}{
{
- name: "hash0",
- // sha256 value obtained from: echo -en 'in1.txt\nin2.txt' | sha256sum
- expectedHash: "18da75b9b1cc74b09e365b4ca2e321b5d618f438cc632b387ad9dc2ab4b20e9d",
+ name: "hash0",
+ expectedHash: hashOf("implicit\nin1.txt\nin2.txt"),
},
{
- name: "hash1",
- // sha256 value obtained from: echo -en 'in1.txt\nin2.txt\nin3.txt' | sha256sum
- expectedHash: "a38d432a4b19df93140e1f1fe26c97ff0387dae01fe506412b47208f0595fb45",
+ name: "hash1",
+ expectedHash: hashOf("implicit\nin1.txt\nin2.txt\nin3.txt"),
},
}