diff options
| author | Colin Cross <ccross@android.com> | 2019-04-02 08:21:42 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-04-02 08:21:42 -0700 |
| commit | a50a2464c660a92019ab381f550f2ec2c89a75b6 (patch) | |
| tree | d9edc9aacf1ce26062557fc532c28f8c86e86244 /java | |
| parent | 8de11009cdb20c08eb6cb0fd96462624e12bc58d (diff) | |
| parent | 6c99a30bb7969cd720eeb1f53bd2d248fc39d3cc (diff) | |
| download | build_soong-a50a2464c660a92019ab381f550f2ec2c89a75b6.tar.gz build_soong-a50a2464c660a92019ab381f550f2ec2c89a75b6.tar.bz2 build_soong-a50a2464c660a92019ab381f550f2ec2c89a75b6.zip | |
Merge changes I7dd4ba7f,I7887a67a am: 92cc71606c am: 900574f0cd
am: 6c99a30bb7
Change-Id: If557897ed64ecdf8967299b5512392e5485767ae
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) |