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
This commit is contained in:
Priyanka Advani
2024-05-01 20:02:36 +00:00
committed by Android (Google) Code Review
parent 0e0d749062
commit ed5276f082
53 changed files with 131 additions and 189 deletions

View File

@@ -69,13 +69,13 @@ func JavaFuzzFactory() android.Module {
android.AddLoadHook(module, func(ctx android.LoadHookContext) {
disableLinuxBionic := struct {
Enabled proptools.Configurable[bool]
}{
Enabled: android.CreateSelectOsToBool(map[string]*bool{
"": nil,
"linux_bionic": proptools.BoolPtr(false),
}),
}
Target struct {
Linux_bionic struct {
Enabled *bool
}
}
}{}
disableLinuxBionic.Target.Linux_bionic.Enabled = proptools.BoolPtr(false)
ctx.AppendProperties(&disableLinuxBionic)
})
@@ -179,7 +179,7 @@ func (s *javaFuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
javaFuzzModule.ApexModuleBase,
}
if ok := fuzz.IsValid(ctx, fuzzModuleValidator); !ok {
if ok := fuzz.IsValid(fuzzModuleValidator); !ok {
return
}