Merge "Revert^2 "Modify conditionals for BuildFromTextStub()"" into main (d8dd46e5) · Commits · e / os / android_build_soong

android/config.go

+9 −3

Original line number	Diff line number	Diff line
		@@ -570,8 +570,6 @@ func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error)
		config: config,
		}

		config.productVariables.Build_from_text_stub = boolPtr(config.BuildFromTextStub())

		// Soundness check of the build and source directories. This won't catch strange
		// configurations with symlinks, but at least checks the obvious case.
		absBuildDir, err := filepath.Abs(cmdArgs.SoongOutDir)
		@@ -707,6 +705,8 @@ func NewConfig(cmdArgs CmdArgs, availableEnv map[string]string) (Config, error)
		"i18n.module.public.api": {},
		}

		config.productVariables.Build_from_text_stub = boolPtr(config.BuildFromTextStub())

		return Config{config}, err
		}

		@@ -2075,11 +2075,17 @@ func (c *config) JavaCoverageEnabled() bool {
		return c.IsEnvTrue("EMMA_INSTRUMENT") \|\| c.IsEnvTrue("EMMA_INSTRUMENT_STATIC") \|\| c.IsEnvTrue("EMMA_INSTRUMENT_FRAMEWORK")
		}

		func (c *deviceConfig) BuildFromSourceStub() bool {
		return Bool(c.config.productVariables.BuildFromSourceStub)
		}

		func (c *config) BuildFromTextStub() bool {
		// TODO: b/302320354 - Remove the coverage build specific logic once the
		// robust solution for handling native properties in from-text stub build
		// is implemented.
		return !c.buildFromSourceStub && !c.JavaCoverageEnabled() && !c.IsEnvTrue("BUILD_FROM_SOURCE_STUB")
		return !c.buildFromSourceStub &&
		!c.JavaCoverageEnabled() &&
		!c.deviceConfig.BuildFromSourceStub()
		}

		func (c *config) SetBuildFromTextStub(b bool) {

+2 −0

Original line number	Diff line number	Diff line
		@@ -494,6 +494,8 @@ type ProductVariables struct {
		Release_expose_flagged_api *bool `json:",omitempty"`

		BuildFlags map[string]string `json:",omitempty"`

		BuildFromSourceStub *bool `json:",omitempty"`
		}

		type PartitionQualifiedVariablesType struct {