diff options
Diffstat (limited to 'java')
| -rw-r--r-- | java/androidmk.go | 3 | ||||
| -rw-r--r-- | java/droiddoc.go | 8 | ||||
| -rw-r--r-- | java/java.go | 3 |
3 files changed, 10 insertions, 4 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index 5740eca9..c6ecfbce 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -304,6 +304,9 @@ func (ddoc *Droiddoc) AndroidMk() android.AndroidMkData { if ddoc.Javadoc.stubsSrcJar != nil { fmt.Fprintln(w, "LOCAL_DROIDDOC_STUBS_SRCJAR := ", ddoc.Javadoc.stubsSrcJar.String()) } + if ddoc.annotationsZip != nil { + fmt.Fprintln(w, "LOCAL_DROIDDOC_ANNOTATIONS_ZIP := ", ddoc.annotationsZip.String()) + } if ddoc.checkCurrentApiTimestamp != nil { fmt.Fprintln(w, ".PHONY:", ddoc.Name()+"-check-current-api") fmt.Fprintln(w, ddoc.Name()+"-check-current-api:", diff --git a/java/droiddoc.go b/java/droiddoc.go index 53c75b5c..2e821ea0 100644 --- a/java/droiddoc.go +++ b/java/droiddoc.go @@ -302,6 +302,8 @@ type Droiddoc struct { checkCurrentApiTimestamp android.WritablePath updateCurrentApiTimestamp android.WritablePath checkLastReleasedApiTimestamp android.WritablePath + + annotationsZip android.WritablePath } func InitDroiddocModule(module android.DefaultableModule, hod android.HostOrDeviceSupported) { @@ -965,8 +967,8 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { } opts += " --include-annotations --migrate-nullness" - annotationsZip := android.PathForModuleOut(ctx, ctx.ModuleName()+"_annotations.zip") - implicitOutputs = append(implicitOutputs, annotationsZip) + d.annotationsZip = android.PathForModuleOut(ctx, ctx.ModuleName()+"_annotations.zip") + implicitOutputs = append(implicitOutputs, d.annotationsZip) if String(d.properties.Metalava_merge_annotations_dir) == "" { ctx.PropertyErrorf("metalava_merge_annotations", @@ -975,7 +977,7 @@ func (d *Droiddoc) GenerateAndroidBuildActions(ctx android.ModuleContext) { mergeAnnotationsDir := android.PathForSource(ctx, String(d.properties.Metalava_merge_annotations_dir)) - opts += " --extract-annotations " + annotationsZip.String() + " --merge-annotations " + mergeAnnotationsDir.String() + opts += " --extract-annotations " + d.annotationsZip.String() + " --merge-annotations " + mergeAnnotationsDir.String() // TODO(tnorbye): find owners to fix these warnings when annotation was enabled. opts += " --hide HiddenTypedefConstant --hide SuperfluousPrefix --hide AnnotationExtraction" } diff --git a/java/java.go b/java/java.go index 53f851bd..a2ba7e6f 100644 --- a/java/java.go +++ b/java/java.go @@ -693,7 +693,8 @@ func getLinkType(m *Module, name string) linkType { ver := m.sdkVersion() noStdLibs := Bool(m.properties.No_standard_libs) switch { - case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations": + case name == "core.current.stubs" || ver == "core_current" || noStdLibs || name == "stub-annotations" || + name == "private-stub-annotations-jar": return javaCore case name == "android_system_stubs_current" || strings.HasPrefix(ver, "system_") || name == "metalava_android_system_stubs_current": return javaSystem |