Don't type variables as booleans in mk2rbc

Our boolean support is not fully fleshed out enough to make variables
real booleans. Keep them strings for now to resolve CI failures.

Bug: 275865081
Test: ./build/bazel/ci/rbc_dashboard.py --quick with aosp/2526609
Change-Id: I636bd9f39b50a47ecf92aecd2bf8ea41eac4d604
This commit is contained in:
Cole Faust 2023-04-12 12:13:28 -07:00
parent aea34a38ca
commit c7335de0dd

View file

@ -67,7 +67,11 @@ func (ctx context) NewSoongVariable(name, typeString string) {
var valueType starlarkType var valueType starlarkType
switch typeString { switch typeString {
case "bool": case "bool":
valueType = starlarkTypeBool // TODO: We run into several issues later on if we type this as a bool:
// - We still assign bool-typed variables to strings
// - When emitting the final results as make code, some bool's false values have to
// be an empty string, and some have to be false in order to match the make variables.
valueType = starlarkTypeString
case "csv": case "csv":
// Only PLATFORM_VERSION_ALL_CODENAMES, and it's a list // Only PLATFORM_VERSION_ALL_CODENAMES, and it's a list
valueType = starlarkTypeList valueType = starlarkTypeList