Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3bb14200 authored by Nan Zhang's avatar Nan Zhang
Browse files

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

Test: m -j core-docs
Bug: b/70351683
Change-Id: If8c00a9992d262b7cd4c95794073591dcc245bd2
parent 0c74ad93

java/droiddoc.go

+1 −1
Original line number Diff line number Diff line
@@ -249,7 +249,7 @@ func (j *Javadoc) collectDeps(ctx android.ModuleContext) deps { 
	j.srcFiles = srcFiles.FilterOutByExt(".srcjar")



	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 {

		j.properties.Local_sourcepaths = append(j.properties.Local_sourcepaths, ".")

java/java_test.go

+2 −2
Original line number Diff line number Diff line
@@ -886,8 +886,8 @@ func TestDroiddoc(t *testing.T) { 
		}

		`)



	stubsJar := filepath.Join(buildDir, ".intermediates", "bar-doc", "android_common", "bar-doc-stubs.jar")

	barDoc := ctx.ModuleForTests("bar-doc", "android_common").Output("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.srcjar")

	if stubsJar != barDoc.Output.String() {

		t.Errorf("expected stubs Jar [%q], got %q", stubsJar, barDoc.Output.String())

	}