diff options
| author | 2024-01-24 21:30:38 +0000 | |
|---|---|---|
| committer | 2024-01-24 21:30:38 +0000 | |
| commit | dbc88dc4d054872a5e54fd9d23e1026ed6553bdc (patch) | |
| tree | 48d36f2d530571e25b86265dab6b36ce5fab9e62 /java/androidmk.go | |
| parent | c50999eb0a2faf87ebea5bf3274b91bff3bccc48 (diff) | |
| parent | ee11328709ae33b5e1a904c75c2120e5c4f846a5 (diff) | |
Merge "Prepare to generate "runtime" stubs in droidstubs" into main
Diffstat (limited to 'java/androidmk.go')
| -rw-r--r-- | java/androidmk.go | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/java/androidmk.go b/java/androidmk.go index cc0efe9b8..c86dcf4be 100644 --- a/java/androidmk.go +++ b/java/androidmk.go @@ -587,7 +587,7 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries { outputFile = android.OptionalPathForPath(dstubs.apiFile) } if !outputFile.Valid() { - outputFile = android.OptionalPathForPath(dstubs.apiVersionsXml) + outputFile = android.OptionalPathForPath(dstubs.everythingArtifacts.apiVersionsXml) } return []android.AndroidMkEntries{android.AndroidMkEntries{ Class: "JAVA_LIBRARIES", @@ -598,14 +598,14 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries { if dstubs.Javadoc.stubsSrcJar != nil { entries.SetPath("LOCAL_DROIDDOC_STUBS_SRCJAR", dstubs.Javadoc.stubsSrcJar) } - if dstubs.apiVersionsXml != nil { - entries.SetPath("LOCAL_DROIDDOC_API_VERSIONS_XML", dstubs.apiVersionsXml) + if dstubs.everythingArtifacts.apiVersionsXml != nil { + entries.SetPath("LOCAL_DROIDDOC_API_VERSIONS_XML", dstubs.everythingArtifacts.apiVersionsXml) } - if dstubs.annotationsZip != nil { - entries.SetPath("LOCAL_DROIDDOC_ANNOTATIONS_ZIP", dstubs.annotationsZip) + if dstubs.everythingArtifacts.annotationsZip != nil { + entries.SetPath("LOCAL_DROIDDOC_ANNOTATIONS_ZIP", dstubs.everythingArtifacts.annotationsZip) } - if dstubs.metadataZip != nil { - entries.SetPath("LOCAL_DROIDDOC_METADATA_ZIP", dstubs.metadataZip) + if dstubs.everythingArtifacts.metadataZip != nil { + entries.SetPath("LOCAL_DROIDDOC_METADATA_ZIP", dstubs.everythingArtifacts.metadataZip) } }, }, |