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:
committed by
Android (Google) Code Review
parent
0e0d749062
commit
ed5276f082
18
cc/fuzz.go
18
cc/fuzz.go
@@ -352,14 +352,18 @@ func NewFuzzer(hod android.HostOrDeviceSupported) *Module {
|
||||
Sanitize struct {
|
||||
Fuzzer *bool
|
||||
}
|
||||
Enabled proptools.Configurable[bool]
|
||||
Target struct {
|
||||
Darwin struct {
|
||||
Enabled *bool
|
||||
}
|
||||
Linux_bionic struct {
|
||||
Enabled *bool
|
||||
}
|
||||
}
|
||||
}{}
|
||||
extraProps.Sanitize.Fuzzer = BoolPtr(true)
|
||||
extraProps.Enabled = android.CreateSelectOsToBool(map[string]*bool{
|
||||
"": nil,
|
||||
"darwin": proptools.BoolPtr(false),
|
||||
"linux_bionic": proptools.BoolPtr(false),
|
||||
})
|
||||
extraProps.Target.Darwin.Enabled = BoolPtr(false)
|
||||
extraProps.Target.Linux_bionic.Enabled = BoolPtr(false)
|
||||
ctx.AppendProperties(&extraProps)
|
||||
|
||||
targetFramework := fuzz.GetFramework(ctx, fuzz.Cc)
|
||||
@@ -429,7 +433,7 @@ func (s *ccRustFuzzPackager) GenerateBuildActions(ctx android.SingletonContext)
|
||||
return
|
||||
}
|
||||
// Discard non-fuzz targets.
|
||||
if ok := fuzz.IsValid(ctx, ccModule.FuzzModuleStruct()); !ok {
|
||||
if ok := fuzz.IsValid(ccModule.FuzzModuleStruct()); !ok {
|
||||
return
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user