Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 645610e7 authored Mar 17, 2021 by Lukács T. Berki Committed by Gerrit Code Review Mar 17, 2021

Merge "Remove global variables from Blueprint."

parents b96a04ba 89e9a16e

android/config.go

+8 −0

Original line number	Diff line number	Diff line
		@@ -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.

cmd/soong_build/main.go

+1 −1

Original line number	Diff line number	Diff line
		@@ -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)
		}

cmd/soong_build/writedocs.go

+4 −4

Original line number	Diff line number	Diff line
		@@ -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
		}