Merge "Revert "Make the enabled property configurable"" into aosp-main-future

1 files changed, 8 insertions, 8 deletions

diff --git a/java/fuzz.go b/java/fuzz.go
index 78ab10891..fb31ce794 100644
--- a/java/fuzz.go
+++ b/java/fuzz.go
@@ -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
 		}