Merge "Prevent evaluating configurable properties before the defaults mutator" into main (0bfceee1) · Commits · e / os / android_build_soong

android/module.go

+7 −0

Original line number	Diff line number	Diff line
		@@ -2215,6 +2215,7 @@ func (m *ModuleBase) IsNativeBridgeSupported() bool {
		type ConfigurableEvaluatorContext interface {
		Config() Config
		OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{})
		HasMutatorFinished(mutatorName string) bool
		}

		type configurationEvalutor struct {
		@@ -2236,6 +2237,12 @@ func (e configurationEvalutor) PropertyErrorf(property string, fmt string, args
		func (e configurationEvalutor) EvaluateConfiguration(condition proptools.ConfigurableCondition, property string) proptools.ConfigurableValue {
		ctx := e.ctx
		m := e.m

		if !ctx.HasMutatorFinished("defaults") {
		ctx.OtherModulePropertyErrorf(m, property, "Cannot evaluate configurable property before the defaults mutator has run")
		return proptools.ConfigurableValueUndefined()
		}

		switch condition.FunctionName() {
		case "release_flag":
		if condition.NumArgs() != 1 {

+1 −0

Original line number	Diff line number	Diff line
		@@ -118,6 +118,7 @@ func runPackagingTest(t *testing.T, config testConfig, bp string, expected []str
		}

		result := GroupFixturePreparers(
		PrepareForTestWithDefaults,
		PrepareForTestWithArchMutator,
		FixtureRegisterWithContext(func(ctx RegistrationContext) {
		ctx.RegisterModuleType("component", componentTestModuleFactory)