From 65dd2c379d135766eaaea065774f9d2efa9d7dfc Mon Sep 17 00:00:00 2001 From: hamzeh Date: Wed, 27 Dec 2023 15:27:12 -0800 Subject: [PATCH] Fix condition that misses packaging some fuzzers Fuzzers that are host only were not packaged in the haiku zip. Bug: 316399445 Test: make haiku Change-Id: I54f1cd3f446667b940063f16599de4139a7a7ade --- fuzz/fuzz_common.go | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/fuzz/fuzz_common.go b/fuzz/fuzz_common.go index 5d7bc2b04..47fd8f439 100644 --- a/fuzz/fuzz_common.go +++ b/fuzz/fuzz_common.go @@ -525,12 +525,10 @@ func (s *FuzzPackager) BuildZipFile(ctx android.SingletonContext, module android builder.Build("create-"+fuzzZip.String(), "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 strings.Contains(hostOrTargetString, "host") && !BoolDefault(config.Fuzz_on_haiku_host, true) { 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 } }