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

Update select tests for optionals

Browse Source 
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I314719c9e287638acbc1ef82651d14fee6e1a55a
This commit is contained in:
Cole Faust
2024-05-21 14:19:05 -07:00
parent e0d5ea1d7c
commit 749eeaa94c
1 changed files with 13 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
android/selects_test.go
View File

@@ -792,13 +792,21 @@ type selectsMockModule struct {
properties selectsMockModuleProperties 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) { func (p *selectsMockModule) GenerateAndroidBuildActions(ctx ModuleContext) {
SetProvider(ctx, selectsTestProviderKey, selectsTestProvider{ SetProvider(ctx, selectsTestProviderKey, selectsTestProvider{
my_bool: p.properties.My_bool.Get(ctx), my_bool: optionalToPtr(p.properties.My_bool.Get(ctx)),
my_string: p.properties.My_string.Get(ctx), my_string: optionalToPtr(p.properties.My_string.Get(ctx)),
my_string_list: p.properties.My_string_list.Get(ctx), my_string_list: optionalToPtr(p.properties.My_string_list.Get(ctx)),
my_paths: p.properties.My_paths.Get(ctx), my_paths: optionalToPtr(p.properties.My_paths.Get(ctx)),
replacing_string_list: p.properties.Replacing_string_list.Get(ctx), replacing_string_list: optionalToPtr(p.properties.Replacing_string_list.Get(ctx)),
my_nonconfigurable_bool: p.properties.My_nonconfigurable_bool, my_nonconfigurable_bool: p.properties.My_nonconfigurable_bool,
my_nonconfigurable_string: p.properties.My_nonconfigurable_string, my_nonconfigurable_string: p.properties.My_nonconfigurable_string,
my_nonconfigurable_string_list: p.properties.My_nonconfigurable_string_list, my_nonconfigurable_string_list: p.properties.My_nonconfigurable_string_list,