tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix condition that misses packaging some fuzzers

Browse source 
Fuzzers that are host only were not packaged in the haiku zip.

Bug: 316399445
Test: make haiku
Change-Id: I54f1cd3f446667b940063f16599de4139a7a7ade
This commit is contained in:
hamzeh 2023-12-27 15:27:12 -08:00
parent ad579a8c71
commit 65dd2c379d
1 changed files with 1 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
fuzz/fuzz_common.go
View file

@ -525,12 +525,10 @@ func (s *FuzzPackager) BuildZipFile(ctx android.SingletonContext, module android
builder.Build("create-"+fuzzZip.String(), builder.Build("create-"+fuzzZip.String(),
"Package "+module.Name()+" for "+archString+"-"+hostOrTargetString) "Package "+module.Name()+" for "+archString+"-"+hostOrTargetString)
// Don't add modules to 'make haiku-rust' that are set to not be
// exported to the fuzzing infrastructure.
if config := fuzzModule.FuzzProperties.Fuzz_config; config != nil { if config := fuzzModule.FuzzProperties.Fuzz_config; config != nil {
if strings.Contains(hostOrTargetString, "host") && !BoolDefault(config.Fuzz_on_haiku_host, true) { if strings.Contains(hostOrTargetString, "host") && !BoolDefault(config.Fuzz_on_haiku_host, true) {
return archDirs[archOs], false return archDirs[archOs], false
} else if !BoolDefault(config.Fuzz_on_haiku_device, true) { } else if !strings.Contains(hostOrTargetString, "host") && !BoolDefault(config.Fuzz_on_haiku_device, true) {
return archDirs[archOs], false return archDirs[archOs], false
} }
} }