From 749eeaa94c89e148543d2495aeb16bd6d3cc841d Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 21 May 2024 14:19:05 -0700 Subject: [PATCH] Update select tests for optionals Bug: 323382414 Test: m nothing --no-skip-soong-tests Change-Id: I314719c9e287638acbc1ef82651d14fee6e1a55a --- android/selects_test.go | 18 +++++++++++++----- 1 file changed, 13 insertions(+), 5 deletions(-) diff --git a/android/selects_test.go b/android/selects_test.go index d9499a500..26e3ec548 100644 --- a/android/selects_test.go +++ b/android/selects_test.go @@ -792,13 +792,21 @@ type selectsMockModule struct { properties selectsMockModuleProperties } +func optionalToPtr[T any](o proptools.ConfigurableOptional[T]) *T { + if o.IsEmpty() { + return nil + } + x := o.Get() + return &x +} + func (p *selectsMockModule) GenerateAndroidBuildActions(ctx ModuleContext) { SetProvider(ctx, selectsTestProviderKey, selectsTestProvider{ - my_bool: p.properties.My_bool.Get(ctx), - my_string: p.properties.My_string.Get(ctx), - my_string_list: p.properties.My_string_list.Get(ctx), - my_paths: p.properties.My_paths.Get(ctx), - replacing_string_list: p.properties.Replacing_string_list.Get(ctx), + my_bool: optionalToPtr(p.properties.My_bool.Get(ctx)), + my_string: optionalToPtr(p.properties.My_string.Get(ctx)), + my_string_list: optionalToPtr(p.properties.My_string_list.Get(ctx)), + my_paths: optionalToPtr(p.properties.My_paths.Get(ctx)), + replacing_string_list: optionalToPtr(p.properties.Replacing_string_list.Get(ctx)), my_nonconfigurable_bool: p.properties.My_nonconfigurable_bool, my_nonconfigurable_string: p.properties.My_nonconfigurable_string, my_nonconfigurable_string_list: p.properties.My_nonconfigurable_string_list,