From c7335de0dd6854b444495c1836cd3dfa66eb9349 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Wed, 12 Apr 2023 12:13:28 -0700 Subject: [PATCH] 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 --- mk2rbc/soong_variables.go | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/mk2rbc/soong_variables.go b/mk2rbc/soong_variables.go index a52ec4f2a..7a6aa5ffa 100644 --- a/mk2rbc/soong_variables.go +++ b/mk2rbc/soong_variables.go @@ -67,7 +67,11 @@ func (ctx context) NewSoongVariable(name, typeString string) { var valueType starlarkType switch typeString { 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": // Only PLATFORM_VERSION_ALL_CODENAMES, and it's a list valueType = starlarkTypeList