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

Add support for .proto files in java modules

Browse Source 
Test: m -j checkbuild
Change-Id: Ia03429948baebff85164a91a34507866c97a08ef
This commit is contained in:
Colin Cross
2017-09-20 12:59:05 -07:00
parent 47ff2521c6
commit 6af17aa022
8 changed files with 211 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
java/gen.go
View File

@@ -85,21 +85,37 @@ func genLogtags(ctx android.ModuleContext, logtagsFile android.Path) android.Pat
}
func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths,
flags javaBuilderFlags) android.Paths {
flags javaBuilderFlags) (android.Paths, android.Paths) {
for i, srcFile := range srcFiles {
var protoFiles android.Paths
outSrcFiles := make(android.Paths, 0, len(srcFiles))
for _, srcFile := range srcFiles {
switch srcFile.Ext() {
case ".aidl":
javaFile := genAidl(ctx, srcFile, flags.aidlFlags)
srcFiles[i] = javaFile
outSrcFiles = append(outSrcFiles, javaFile)
case ".logtags":
j.logtagsSrcs = append(j.logtagsSrcs, srcFile)
javaFile := genLogtags(ctx, srcFile)
srcFiles[i] = javaFile
outSrcFiles = append(outSrcFiles, javaFile)
case ".proto":
protoFiles = append(protoFiles, srcFile)
default:
outSrcFiles = append(outSrcFiles, srcFile)
}
}
return srcFiles
var outSrcFileLists android.Paths
if len(protoFiles) > 0 {
protoFileList := genProto(ctx, protoFiles,
flags.protoFlags, flags.protoOutFlag, "")
outSrcFileLists = append(outSrcFileLists, protoFileList)
}
return outSrcFiles, outSrcFileLists
}
func LogtagsSingleton() blueprint.Singleton {