openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove global variables from Blueprint."

This commit is contained in:
Lukács T. Berki 2021-03-17 07:08:24 +00:00 committed by Gerrit Code Review
parent b96a04ba49 89e9a16ebd
commit 645610e791
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
android/config.go
View File

@ -68,6 +68,14 @@ func (c Config) BuildDir() string {
return c.buildDir
}
func (c Config) NinjaBuildDir() string {
return c.buildDir
}
func (c Config) SrcDir() string {
return c.srcDir
}
// A DeviceConfig object represents the configuration for a particular device
// being built. For now there will only be one of these, but in the future there
// may be multiple devices being built.

2
cmd/soong_build/main.go
View File

@ -158,7 +158,7 @@ func main() {
}
if docFile != "" {
if err := writeDocs(ctx, docFile); err != nil {
if err := writeDocs(ctx, configuration, docFile); err != nil {
fmt.Fprintf(os.Stderr, "%s", err)
os.Exit(1)
}

8
cmd/soong_build/writedocs.go
View File

@ -95,13 +95,13 @@ func moduleTypeDocsToTemplates(moduleTypeList []*bpdoc.ModuleType) []moduleTypeT
return result
}
func getPackages(ctx *android.Context) ([]*bpdoc.Package, error) {
func getPackages(ctx *android.Context, config interface{}) ([]*bpdoc.Package, error) {
moduleTypeFactories := android.ModuleTypeFactoriesForDocs()
return bootstrap.ModuleTypeDocs(ctx.Context, moduleTypeFactories)
return bootstrap.ModuleTypeDocs(ctx.Context, config, moduleTypeFactories)
}
func writeDocs(ctx *android.Context, filename string) error {
packages, err := getPackages(ctx)
func writeDocs(ctx *android.Context, config interface{}, filename string) error {
packages, err := getPackages(ctx, config)
if err != nil {
return err
}