openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Change name of droiddoc target output to *-stubs.srcjar 

Test: m -j core-docs
Bug: b/70351683
Change-Id: If8c00a9992d262b7cd4c95794073591dcc245bd2
This commit is contained in:
Nan Zhang 2018-02-28 10:14:25 -08:00
parent 0c74ad9381
commit 3bb14200e2
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
java/droiddoc.go
View File

@ -249,7 +249,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps {
j.srcFiles = srcFiles.FilterOutByExt(".srcjar") j.srcFiles = srcFiles.FilterOutByExt(".srcjar")
j.docZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"docs.zip") j.docZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"docs.zip")
j.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"stubs.jar") j.stubsJar = android.PathForModuleOut(ctx, ctx.ModuleName()+"-"+"stubs.srcjar")
if j.properties.Local_sourcepaths == nil { if j.properties.Local_sourcepaths == nil {
j.properties.Local_sourcepaths = append(j.properties.Local_sourcepaths, ".") j.properties.Local_sourcepaths = append(j.properties.Local_sourcepaths, ".")

4
java/java_test.go
View File

@ -886,8 +886,8 @@ func TestDroiddoc(t *testing.T) {
} }
`) `)
stubsJar := filepath.Join(buildDir, ".intermediates", "bar-doc", "android_common", "bar-doc-stubs.jar") stubsJar := filepath.Join(buildDir, ".intermediates", "bar-doc", "android_common", "bar-doc-stubs.srcjar")
barDoc := ctx.ModuleForTests("bar-doc", "android_common").Output("bar-doc-stubs.jar") barDoc := ctx.ModuleForTests("bar-doc", "android_common").Output("bar-doc-stubs.srcjar")
if stubsJar != barDoc.Output.String() { if stubsJar != barDoc.Output.String() {
t.Errorf("expected stubs Jar [%q], got %q", stubsJar, barDoc.Output.String()) t.Errorf("expected stubs Jar [%q], got %q", stubsJar, barDoc.Output.String())
} }