Revert "Make the enabled property configurable"
Revert submission 27162921-configurable_enabled_property
Reason for revert: Droid-monitor created revert due to Build breakage in b/338253720. Will be verifying through ABTD before submission.
Reverted changes: /q/submissionid:27162921-configurable_enabled_property
Change-Id: I2d144f9d297373a13a1190b173d10c966181ad84
diff --git a/rust/fuzz.go b/rust/fuzz.go
index da111b5..1770d2e 100644
--- a/rust/fuzz.go
+++ b/rust/fuzz.go
@@ -20,8 +20,6 @@
"android/soong/fuzz"
"android/soong/rust/config"
"path/filepath"
-
- "github.com/google/blueprint/proptools"
)
func init() {
@@ -66,14 +64,17 @@
android.AddLoadHook(module, func(ctx android.LoadHookContext) {
extraProps := struct {
- Enabled proptools.Configurable[bool]
- }{
- Enabled: android.CreateSelectOsToBool(map[string]*bool{
- "": nil,
- "darwin": proptools.BoolPtr(false),
- "linux_bionic": proptools.BoolPtr(false),
- }),
- }
+ 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)
ctx.AppendProperties(&extraProps)
})