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

Merge "Rust: WriteFileRule instead of printf for protos"

Browse Source
This commit is contained in:
Ivan Lozano
2020-12-11 19:14:29 +00:00
committed by Gerrit Code Review
parent d36c83862f 9d74a52706
commit 30530a9e34
4 changed files with 14 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
rust/builder.go
View File

@@ -189,6 +189,7 @@ func transformSrctoCrate(ctx ModuleContext, main android.Path, deps PathDeps, fl
implicits = append(implicits, rustLibsToPaths(deps.ProcMacros)...) implicits = append(implicits, rustLibsToPaths(deps.ProcMacros)...)
implicits = append(implicits, deps.StaticLibs...) implicits = append(implicits, deps.StaticLibs...)
implicits = append(implicits, deps.SharedLibs...) implicits = append(implicits, deps.SharedLibs...)
implicits = append(implicits, deps.srcProviderFiles...)
if deps.CrtBegin.Valid() { if deps.CrtBegin.Valid() {
implicits = append(implicits, deps.CrtBegin.Path(), deps.CrtEnd.Path()) implicits = append(implicits, deps.CrtBegin.Path(), deps.CrtEnd.Path())

1
rust/library.go
View File

@@ -433,6 +433,7 @@ func (library *libraryDecorator) compile(ctx ModuleContext, flags Flags, deps Pa
if library.sourceProvider != nil { if library.sourceProvider != nil {
// Assume the first source from the source provider is the library entry point. // Assume the first source from the source provider is the library entry point.
srcPath = library.sourceProvider.Srcs()[0] srcPath = library.sourceProvider.Srcs()[0]
deps.srcProviderFiles = append(deps.srcProviderFiles, library.sourceProvider.Srcs()...)
} else { } else {
srcPath, _ = srcPathFromModuleSrcs(ctx, library.baseCompiler.Properties.Srcs) srcPath, _ = srcPathFromModuleSrcs(ctx, library.baseCompiler.Properties.Srcs)
} }

18
rust/protobuf.go
View File

@@ -46,7 +46,7 @@ func init() {
var _ SourceProvider = (*protobufDecorator)(nil) var _ SourceProvider = (*protobufDecorator)(nil)
type ProtobufProperties struct { type ProtobufProperties struct {
// List of realtive paths to proto files that will be used to generate the source // List of relative paths to proto files that will be used to generate the source
Protos []string `android:"path,arch_variant"` Protos []string `android:"path,arch_variant"`
// List of additional flags to pass to aprotoc // List of additional flags to pass to aprotoc
@@ -80,6 +80,10 @@ func (proto *protobufDecorator) GenerateSource(ctx ModuleContext, deps PathDeps)
protoFiles := android.PathsForModuleSrc(ctx, proto.Properties.Protos) protoFiles := android.PathsForModuleSrc(ctx, proto.Properties.Protos)
if len(protoFiles) == 0 {
ctx.PropertyErrorf("protos", "at least one protobuf must be defined.")
}
// Add exported dependency include paths // Add exported dependency include paths
for _, include := range deps.depIncludePaths { for _, include := range deps.depIncludePaths {
protoFlags.Flags = append(protoFlags.Flags, "-I"+include.String()) protoFlags.Flags = append(protoFlags.Flags, "-I"+include.String())
@@ -91,7 +95,7 @@ func (proto *protobufDecorator) GenerateSource(ctx ModuleContext, deps PathDeps)
stemFile := android.PathForModuleOut(ctx, "mod_"+stem+".rs") stemFile := android.PathForModuleOut(ctx, "mod_"+stem+".rs")
// stemFile must be first here as the first path in BaseSourceProvider.OutputFiles is the library entry-point. // stemFile must be first here as the first path in BaseSourceProvider.OutputFiles is the library entry-point.
outputs := android.WritablePaths{stemFile} var outputs android.WritablePaths
rule := android.NewRuleBuilder(pctx, ctx) rule := android.NewRuleBuilder(pctx, ctx)
for _, protoFile := range protoFiles { for _, protoFile := range protoFiles {
@@ -112,14 +116,12 @@ func (proto *protobufDecorator) GenerateSource(ctx ModuleContext, deps PathDeps)
outputs = append(outputs, ruleOutputs...) outputs = append(outputs, ruleOutputs...)
} }
rule.Command(). android.WriteFileRule(ctx, stemFile, proto.genModFileContents(ctx, protoNames))
Implicits(outputs.Paths()).
Text("printf '" + proto.genModFileContents(ctx, protoNames) + "' >").
Output(stemFile)
rule.Build("protoc_"+ctx.ModuleName(), "protoc "+ctx.ModuleName()) rule.Build("protoc_"+ctx.ModuleName(), "protoc "+ctx.ModuleName())
proto.BaseSourceProvider.OutputFiles = outputs.Paths() // stemFile must be first here as the first path in BaseSourceProvider.OutputFiles is the library entry-point.
proto.BaseSourceProvider.OutputFiles = append(android.Paths{stemFile}, outputs.Paths()...)
// mod_stem.rs is the entry-point for our library modules, so this is what we return. // mod_stem.rs is the entry-point for our library modules, so this is what we return.
return stemFile return stemFile
@@ -145,7 +147,7 @@ func (proto *protobufDecorator) genModFileContents(ctx ModuleContext, protoNames
"}") "}")
} }
return strings.Join(lines, "\\n") return strings.Join(lines, "\n")
} }
func (proto *protobufDecorator) setupPlugin(ctx ModuleContext, protoFlags android.ProtoFlags, outDir android.ModuleOutPath) (android.Paths, android.ProtoFlags) { func (proto *protobufDecorator) setupPlugin(ctx ModuleContext, protoFlags android.ProtoFlags, outDir android.ModuleOutPath) (android.Paths, android.ProtoFlags) {

1
rust/rust.go
View File

@@ -246,6 +246,7 @@ type PathDeps struct {
// Paths to generated source files // Paths to generated source files
SrcDeps android.Paths SrcDeps android.Paths
srcProviderFiles android.Paths
} }
type RustLibraries []RustLibrary type RustLibraries []RustLibrary