diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-02-28 10:14:25 -0800 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2018-02-28 16:15:05 -0800 |
| commit | 3bb14200e2a6f691789d2f311b30cb881a8d99a0 (patch) | |
| tree | 2f9454d427daa93cdd7391aa433106493825dd56 /java | |
| parent | 0c74ad9381e33545e77596dd0e9208e5e215eae8 (diff) | |
| download | build_soong-3bb14200e2a6f691789d2f311b30cb881a8d99a0.tar.gz build_soong-3bb14200e2a6f691789d2f311b30cb881a8d99a0.tar.bz2 build_soong-3bb14200e2a6f691789d2f311b30cb881a8d99a0.zip | |
Change name of droiddoc target output to *-stubs.srcjar
Test: m -j core-docs
Bug: b/70351683
Change-Id: If8c00a9992d262b7cd4c95794073591dcc245bd2
Diffstat (limited to 'java')
| -rw-r--r-- | java/droiddoc.go | 2 | ||||
| -rw-r--r-- | java/java_test.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/java/droiddoc.go b/java/droiddoc.go index ac6bd338..82beb964 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 eda229ba..8bae019c 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()) } |