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

Merge "Droiddoc can accept logtags as input sources"

Browse Source
This commit is contained in:
Treehugger Robot
2019-08-23 04:35:49 +00:00
committed by Gerrit Code Review
parent fb7e0b3aa2 d90d7413b7
commit 95515641e7
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
java/droiddoc.go
View File

@@ -474,6 +474,7 @@ func (j *Javadoc) aidlFlags(ctx android.ModuleContext, aidlPreprocess android.Op
return strings.Join(flags, " "), deps return strings.Join(flags, " "), deps
} }
// TODO: remove the duplication between this and the one in gen.go
func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths, func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths,
flags droiddocBuilderFlags) android.Paths { flags droiddocBuilderFlags) android.Paths {
@@ -487,6 +488,9 @@ func (j *Javadoc) genSources(ctx android.ModuleContext, srcFiles android.Paths,
case ".sysprop": case ".sysprop":
javaFile := genSysprop(ctx, srcFile) javaFile := genSysprop(ctx, srcFile)
outSrcFiles = append(outSrcFiles, javaFile) outSrcFiles = append(outSrcFiles, javaFile)
case ".logtags":
javaFile := genLogtags(ctx, srcFile)
outSrcFiles = append(outSrcFiles, javaFile)
default: default:
outSrcFiles = append(outSrcFiles, srcFile) outSrcFiles = append(outSrcFiles, srcFile)
} }