diff options
| author | Nan Zhang <nanzhang@google.com> | 2018-03-01 02:30:12 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-03-01 02:30:12 +0000 |
| commit | 429b71ea11f4c942cd03fa76dd96c3158c043bf0 (patch) | |
| tree | 8e3bcf4c1a64d720ea56c9c5664165ac90f776ab /java | |
| parent | be5ee2db09692636e71a3fdf0c5378f03cc7b68b (diff) | |
| parent | 7f5686aee1c52a6fc689d94d0ff406b0ea49b62d (diff) | |
| download | build_soong-429b71ea11f4c942cd03fa76dd96c3158c043bf0.tar.gz build_soong-429b71ea11f4c942cd03fa76dd96c3158c043bf0.tar.bz2 build_soong-429b71ea11f4c942cd03fa76dd96c3158c043bf0.zip | |
Change name of droiddoc target output to *-stubs.srcjar am: 3bb14200e2 am: b1e6641a77
am: 7f5686aee1
Change-Id: I81aa0f094cad9f7c00fa7dcbc77c758fccd2d4c4
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()) } |