StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Fix droiddoc disting when WITHOUT_CHECK_API is true."

Browse Source
This commit is contained in:
Jingwen Chen
2020-08-10 05:22:24 +00:00
committed by Gerrit Code Review
parent 6df337255c 7b27ca7dad
commit fc16b6684e
3 changed files with 19 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
java/androidmk.go
View File

@@ -559,15 +559,21 @@ func (dstubs *Droidstubs) AndroidMkEntries() []android.AndroidMkEntries {
// are created in make if only the api txt file is being generated. This is
// needed because an invalid output file would prevent the make entries from
// being written.
//
// Note that dstubs.apiFile can be also be nil if WITHOUT_CHECKS_API is true.
// TODO(b/146727827): Revert when we do not need to generate stubs and API separately.
distFile := dstubs.apiFile
var distFiles android.TaggedDistFiles
if dstubs.apiFile != nil {
distFiles = android.MakeDefaultDistFiles(dstubs.apiFile)
}
outputFile := android.OptionalPathForPath(dstubs.stubsSrcJar)
if !outputFile.Valid() {
outputFile = android.OptionalPathForPath(distFile)
outputFile = android.OptionalPathForPath(dstubs.apiFile)
}
return []android.AndroidMkEntries{android.AndroidMkEntries{
Class: "JAVA_LIBRARIES",
DistFiles: android.MakeDefaultDistFiles(distFile),
DistFiles: distFiles,
OutputFile: outputFile,
Include: "$(BUILD_SYSTEM)/soong_droiddoc_prebuilt.mk",
ExtraEntries: []android.AndroidMkExtraEntriesFunc{