diff options
| author | Colin Cross <ccross@android.com> | 2019-04-02 15:04:06 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-04-02 15:04:06 +0000 |
| commit | 92cc71606cc14272ea7859ed1bc410d5deb64867 (patch) | |
| tree | dc7044b5509e038c1a3f4fab3a5af7166da2c8f1 /java | |
| parent | 7a313bc6142eec6f439f868c0cf15ff8f8144584 (diff) | |
| parent | 1d2cf0494af3027f57d8d0d7495dc1a46d20886e (diff) | |
| download | build_soong-92cc71606cc14272ea7859ed1bc410d5deb64867.tar.gz build_soong-92cc71606cc14272ea7859ed1bc410d5deb64867.tar.bz2 build_soong-92cc71606cc14272ea7859ed1bc410d5deb64867.zip | |
Merge changes I7dd4ba7f,I7887a67a
* changes:
Add depfile support to RuleBuilder
Add RuleBuilderCommand.Flags
Diffstat (limited to 'java')
| -rw-r--r-- | java/dexpreopt_bootjars_test.go | 2 |
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) |