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

Merge changes from topics "fix_selects_appending", "refactor_selects" into main am: 29067ccade

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3064416

Change-Id: Ic8ddd309333d4e07d3f3601f4253e997d47fccb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-04-30 01:47:35 +00:00
committed by Automerger Merge Worker
parent cd1add3a69 29067ccade
commit a144ec581d
1 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
android/module.go
View File

@@ -2142,13 +2142,13 @@ func (e configurationEvalutor) PropertyErrorf(property string, fmt string, args
func (e configurationEvalutor) EvaluateConfiguration(condition proptools.ConfigurableCondition, property string) proptools.ConfigurableValue { func (e configurationEvalutor) EvaluateConfiguration(condition proptools.ConfigurableCondition, property string) proptools.ConfigurableValue {
ctx := e.ctx ctx := e.ctx
m := e.m m := e.m
switch condition.FunctionName { switch condition.FunctionName() {
case "release_variable": case "release_variable":
if len(condition.Args) != 1 { if condition.NumArgs() != 1 {
ctx.OtherModulePropertyErrorf(m, property, "release_variable requires 1 argument, found %d", len(condition.Args)) ctx.OtherModulePropertyErrorf(m, property, "release_variable requires 1 argument, found %d", condition.NumArgs())
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
} }
if v, ok := ctx.Config().productVariables.BuildFlags[condition.Args[0]]; ok { if v, ok := ctx.Config().productVariables.BuildFlags[condition.Arg(0)]; ok {
return proptools.ConfigurableValueString(v) return proptools.ConfigurableValueString(v)
} }
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
@@ -2157,12 +2157,12 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu
ctx.OtherModulePropertyErrorf(m, property, "TODO(b/323382414): Product variables are not yet supported in selects") ctx.OtherModulePropertyErrorf(m, property, "TODO(b/323382414): Product variables are not yet supported in selects")
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
case "soong_config_variable": case "soong_config_variable":
if len(condition.Args) != 2 { if condition.NumArgs() != 2 {
ctx.OtherModulePropertyErrorf(m, property, "soong_config_variable requires 2 arguments, found %d", len(condition.Args)) ctx.OtherModulePropertyErrorf(m, property, "soong_config_variable requires 2 arguments, found %d", condition.NumArgs())
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
} }
namespace := condition.Args[0] namespace := condition.Arg(0)
variable := condition.Args[1] variable := condition.Arg(1)
if n, ok := ctx.Config().productVariables.VendorVars[namespace]; ok { if n, ok := ctx.Config().productVariables.VendorVars[namespace]; ok {
if v, ok := n[variable]; ok { if v, ok := n[variable]; ok {
return proptools.ConfigurableValueString(v) return proptools.ConfigurableValueString(v)
@@ -2170,8 +2170,8 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu
} }
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
case "arch": case "arch":
if len(condition.Args) != 0 { if condition.NumArgs() != 0 {
ctx.OtherModulePropertyErrorf(m, property, "arch requires no arguments, found %d", len(condition.Args)) ctx.OtherModulePropertyErrorf(m, property, "arch requires no arguments, found %d", condition.NumArgs())
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
} }
if !m.base().ArchReady() { if !m.base().ArchReady() {
@@ -2180,8 +2180,8 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu
} }
return proptools.ConfigurableValueString(m.base().Arch().ArchType.Name) return proptools.ConfigurableValueString(m.base().Arch().ArchType.Name)
case "os": case "os":
if len(condition.Args) != 0 { if condition.NumArgs() != 0 {
ctx.OtherModulePropertyErrorf(m, property, "os requires no arguments, found %d", len(condition.Args)) ctx.OtherModulePropertyErrorf(m, property, "os requires no arguments, found %d", condition.NumArgs())
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
} }
// the arch mutator runs after the os mutator, we can just use this to enforce that os is ready. // the arch mutator runs after the os mutator, we can just use this to enforce that os is ready.
@@ -2194,8 +2194,8 @@ func (e configurationEvalutor) EvaluateConfiguration(condition proptools.Configu
// We currently don't have any other boolean variables (we should add support for typing // We currently don't have any other boolean variables (we should add support for typing
// the soong config variables), so add this fake one for testing the boolean select // the soong config variables), so add this fake one for testing the boolean select
// functionality. // functionality.
if len(condition.Args) != 0 { if condition.NumArgs() != 0 {
ctx.OtherModulePropertyErrorf(m, property, "boolean_var_for_testing requires 0 arguments, found %d", len(condition.Args)) ctx.OtherModulePropertyErrorf(m, property, "boolean_var_for_testing requires 0 arguments, found %d", condition.NumArgs())
return proptools.ConfigurableValueUndefined() return proptools.ConfigurableValueUndefined()
} }