Make the enabled property configurable
This allows using select statements with it.
Ignore-AOSP-First: This needs to be in a topic with changes in interal-only repositories, I'll cherrypick to aosp after.
Bug: 323382414
Test: m nothing --no-skip-soong-tests
Change-Id: I6f3efaaa3d82505e38a91ee4ba0e18e404360191
diff --git a/rust/fuzz.go b/rust/fuzz.go
index 1770d2e..da111b5 100644
--- a/rust/fuzz.go
+++ b/rust/fuzz.go
@@ -20,6 +20,8 @@
"android/soong/fuzz"
"android/soong/rust/config"
"path/filepath"
+
+ "github.com/google/blueprint/proptools"
)
func init() {
@@ -64,17 +66,14 @@
android.AddLoadHook(module, func(ctx android.LoadHookContext) {
extraProps := struct {
- Target struct {
- Darwin struct {
- Enabled *bool
- }
- Linux_bionic struct {
- Enabled *bool
- }
- }
- }{}
- extraProps.Target.Darwin.Enabled = cc.BoolPtr(false)
- extraProps.Target.Linux_bionic.Enabled = cc.BoolPtr(false)
+ Enabled proptools.Configurable[bool]
+ }{
+ Enabled: android.CreateSelectOsToBool(map[string]*bool{
+ "": nil,
+ "darwin": proptools.BoolPtr(false),
+ "linux_bionic": proptools.BoolPtr(false),
+ }),
+ }
ctx.AppendProperties(&extraProps)
})