diff options
Diffstat (limited to 'fuzz')
| -rw-r--r-- | fuzz/fuzz_common.go | 21 |
1 files changed, 8 insertions, 13 deletions
diff --git a/fuzz/fuzz_common.go b/fuzz/fuzz_common.go index 1a87b30d4..46b254f0b 100644 --- a/fuzz/fuzz_common.go +++ b/fuzz/fuzz_common.go @@ -27,13 +27,12 @@ import ( "android/soong/android" ) -type FuzzType string +type Lang string const ( - Cc FuzzType = "" - Rust FuzzType = "rust" - Java FuzzType = "java" - AFL FuzzType = "AFL" + Cc Lang = "" + Rust Lang = "rust" + Java Lang = "java" ) var BoolDefault = proptools.BoolDefault @@ -48,7 +47,6 @@ type FuzzPackager struct { Packages android.Paths FuzzTargets map[string]bool SharedLibInstallStrings []string - FuzzType FuzzType } type FileToZip struct { @@ -267,7 +265,7 @@ func (f *FuzzConfig) String() string { return string(b) } -func (s *FuzzPackager) CreateFuzzPackage(ctx android.SingletonContext, archDirs map[ArchOs][]FileToZip, fuzzType FuzzType, pctx android.PackageContext) { +func (s *FuzzPackager) CreateFuzzPackage(ctx android.SingletonContext, archDirs map[ArchOs][]FileToZip, lang Lang, pctx android.PackageContext) { var archOsList []ArchOs for archOs := range archDirs { archOsList = append(archOsList, archOs) @@ -280,15 +278,12 @@ func (s *FuzzPackager) CreateFuzzPackage(ctx android.SingletonContext, archDirs hostOrTarget := archOs.HostOrTarget builder := android.NewRuleBuilder(pctx, ctx) zipFileName := "fuzz-" + hostOrTarget + "-" + arch + ".zip" - if fuzzType == Rust { + if lang == Rust { zipFileName = "fuzz-rust-" + hostOrTarget + "-" + arch + ".zip" } - if fuzzType == Java { + if lang == Java { zipFileName = "fuzz-java-" + hostOrTarget + "-" + arch + ".zip" } - if fuzzType == AFL { - zipFileName = "fuzz-afl-" + hostOrTarget + "-" + arch + ".zip" - } outputFile := android.PathForOutput(ctx, zipFileName) s.Packages = append(s.Packages, outputFile) @@ -299,6 +294,7 @@ func (s *FuzzPackager) CreateFuzzPackage(ctx android.SingletonContext, archDirs Flag("-L 0") // No need to try and re-compress the zipfiles. for _, fileToZip := range filesToZip { + if fileToZip.DestinationPathPrefix != "" { command.FlagWithArg("-P ", fileToZip.DestinationPathPrefix) } else { @@ -317,7 +313,6 @@ func (s *FuzzPackager) PreallocateSlice(ctx android.MakeVarsContext, targets str for target, _ := range s.FuzzTargets { fuzzTargets = append(fuzzTargets, target) } - sort.Strings(fuzzTargets) ctx.Strict(targets, strings.Join(fuzzTargets, " ")) } |