From 3bb14200e2a6f691789d2f311b30cb881a8d99a0 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Wed, 28 Feb 2018 10:14:25 -0800 Subject: [PATCH] Change name of droiddoc target output to *-stubs.srcjar Test: m -j core-docs Bug: b/70351683 Change-Id: If8c00a9992d262b7cd4c95794073591dcc245bd2 --- java/droiddoc.go | 2 +- java/java_test.go | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java/droiddoc.go b/java/droiddoc.go index ac6bd3388..82beb964c 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -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, ".") diff --git a/java/java_test.go b/java/java_test.go index eda229ba7..8bae019c6 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -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()) }