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

Merge "Add support for sysprop description files to Java"

Browse Source
This commit is contained in:
Treehugger Robot
2018-10-23 03:45:07 +00:00
committed by Gerrit Code Review
parent a0790e35c7 108be54c4e
commit 5429ed0f20
1 changed files with 28 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
java/gen.go
View File

@@ -26,6 +26,7 @@ import (
func init() { func init() {
pctx.HostBinToolVariable("aidlCmd", "aidl") pctx.HostBinToolVariable("aidlCmd", "aidl")
pctx.HostBinToolVariable("syspropCmd", "sysprop_java")
pctx.SourcePathVariable("logtagsCmd", "build/tools/java-event-log-tags.py") pctx.SourcePathVariable("logtagsCmd", "build/tools/java-event-log-tags.py")
pctx.SourcePathVariable("mergeLogtagsCmd", "build/tools/merge-event-log-tags.py") pctx.SourcePathVariable("mergeLogtagsCmd", "build/tools/merge-event-log-tags.py")
} }
@@ -49,6 +50,17 @@ var (
Command: "$mergeLogtagsCmd -o $out $in", Command: "$mergeLogtagsCmd -o $out $in",
CommandDeps: []string{"$mergeLogtagsCmd"}, CommandDeps: []string{"$mergeLogtagsCmd"},
}) })
sysprop = pctx.AndroidStaticRule("sysprop",
blueprint.RuleParams{
Command: `rm -rf $out.tmp && mkdir -p $out.tmp && ` +
`$syspropCmd --java-output-dir $out.tmp $in && ` +
`${config.SoongZipCmd} -jar -o $out -C $out.tmp -D $out.tmp && rm -rf $out.tmp`,
CommandDeps: []string{
"$syspropCmd",
"${config.SoongZipCmd}",
},
})
) )
func genAidl(ctx android.ModuleContext, aidlFile android.Path, aidlFlags string) android.Path { func genAidl(ctx android.ModuleContext, aidlFile android.Path, aidlFlags string) android.Path {
@@ -82,6 +94,19 @@ func genLogtags(ctx android.ModuleContext, logtagsFile android.Path) android.Pat
return javaFile return javaFile
} }
func genSysprop(ctx android.ModuleContext, syspropFile android.Path) android.Path {
srcJarFile := android.GenPathWithExt(ctx, "sysprop", syspropFile, "srcjar")
ctx.Build(pctx, android.BuildParams{
Rule: sysprop,
Description: "sysprop_java " + syspropFile.Rel(),
Output: srcJarFile,
Input: syspropFile,
})
return srcJarFile
}
func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths, func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths,
flags javaBuilderFlags) android.Paths { flags javaBuilderFlags) android.Paths {
@@ -99,6 +124,9 @@ func (j *Module) genSources(ctx android.ModuleContext, srcFiles android.Paths,
case ".proto": case ".proto":
srcJarFile := genProto(ctx, srcFile, flags) srcJarFile := genProto(ctx, srcFile, flags)
outSrcFiles = append(outSrcFiles, srcJarFile) outSrcFiles = append(outSrcFiles, srcJarFile)
case ".sysprop":
srcJarFile := genSysprop(ctx, srcFile)
outSrcFiles = append(outSrcFiles, srcJarFile)
default: default:
outSrcFiles = append(outSrcFiles, srcFile) outSrcFiles = append(outSrcFiles, srcFile)
} }