StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes Ic2a585ea,I11ccabc4,Icc932c4a,I020556c7,I08713e91

Browse Source 
am: ed9a92c311

Change-Id: I0367335939181566063b777184e864a7afb02308
This commit is contained in:
Colin Cross
2019-07-22 14:04:58 -07:00
committed by android-build-merger
parent cebbe099df ed9a92c311
commit a373a94fc0
7 changed files with 720 additions and 692 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
java/java_test.go
View File

@@ -783,11 +783,6 @@ func TestDroiddoc(t *testing.T) {
}
`)
stubsJar := filepath.Join(buildDir, ".intermediates", "bar-doc", "android_common", "bar-doc-stubs.srcjar")
barDoc := ctx.ModuleForTests("bar-doc", "android_common").Output("bar-doc-stubs.srcjar")
if stubsJar != barDoc.Output.String() {
t.Errorf("expected stubs Jar [%q], got %q", stubsJar, barDoc.Output.String())
}
inputs := ctx.ModuleForTests("bar-doc", "android_common").Rule("javadoc").Inputs
var javaSrcs []string
for _, i := range inputs {