aboutsummaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
authorColin Cross <ccross@android.com>2019-03-29 15:33:06 -0700
committerColin Cross <ccross@android.com>2019-03-29 16:35:06 -0700
commit1d2cf0494af3027f57d8d0d7495dc1a46d20886e (patch)
tree9e8176b3413a444b4e1cf28580d21dadf19c0dea /java
parent92b7d584c80f2efa8fe38338d7372f2d14db4b48 (diff)
downloadbuild_soong-1d2cf0494af3027f57d8d0d7495dc1a46d20886e.tar.gz
build_soong-1d2cf0494af3027f57d8d0d7495dc1a46d20886e.tar.bz2
build_soong-1d2cf0494af3027f57d8d0d7495dc1a46d20886e.zip
Add depfile support to RuleBuilder
Allow rules built with RuleBuilder to use depfiles. Ninja only supports a single depfile with single output. If there are multiple outputs in a rule, move all but the first to implicit outputs. If multiple depfiles are specified, use new support in dep_fixer to combine additional depfiles into the first depfile. Test: rule_builder_test.go Change-Id: I7dd4ba7fdf9feaf89b3dd2b7abb0e79006e06018
Diffstat (limited to 'java')
-rw-r--r--java/dexpreopt_bootjars_test.go2
1 files changed, 1 insertions, 1 deletions
diff --git a/java/dexpreopt_bootjars_test.go b/java/dexpreopt_bootjars_test.go
index 141f7ba4..cbb52f15 100644
--- a/java/dexpreopt_bootjars_test.go
+++ b/java/dexpreopt_bootjars_test.go
@@ -103,7 +103,7 @@ func TestDexpreoptBootJars(t *testing.T) {
expectedOutputs[i] = filepath.Join(buildDir, "test_device", expectedOutputs[i])
}
- outputs := bootArt.Outputs.Strings()
+ outputs := append(android.WritablePaths{bootArt.Output}, bootArt.ImplicitOutputs...).Strings()
sort.Strings(outputs)
sort.Strings(expectedOutputs)