From 9afc301b0902504af56d48a53c60cd55090ced15 Mon Sep 17 00:00:00 2001
From: kalder <61064868+kalder@users.noreply.github.com>
Date: Wed, 9 Nov 2022 10:16:44 -0800
Subject: pkg/report: don't call get_maintainer.pl for cuttlefish

* pkg/report: check for get_maintainer.pl before calling it

For Android kernels, this tool will be in a different location
(common/scripts/get_maintainer.pl). Currently this causes the
Symbolize() call to fail, which stops reproduction.

* pkg/report: check for get_maintainer.pl before calling it

For Android kernels, this tool will be in a different location
(common/scripts/get_maintainer.pl). Currently this causes the
Symbolize() call to fail, which stops reproduction.
---
 pkg/report/linux.go  | 6 ++++++
 pkg/report/report.go | 2 ++
 2 files changed, 8 insertions(+)

(limited to 'pkg')

diff --git a/pkg/report/linux.go b/pkg/report/linux.go
index 1f14f6c20..fc2494adf 100644
--- a/pkg/report/linux.go
+++ b/pkg/report/linux.go
@@ -370,6 +370,12 @@ func (ctx *linux) Symbolize(rep *Report) error {
 
 	rep.Report = ctx.decompileOpcodes(rep.Report, rep)
 
+	// Skip getting maintainers for Android fuzzing since the kernel source
+	// directory structure is different.
+	if ctx.config.vmType == "cuttlefish" || ctx.config.vmType == "proxyapp" {
+		return nil
+	}
+
 	// We still do this even if we did not symbolize,
 	// because tests pass in already symbolized input.
 	rep.guiltyFile = ctx.extractGuiltyFile(rep)
diff --git a/pkg/report/report.go b/pkg/report/report.go
index 951478d8d..037d03562 100644
--- a/pkg/report/report.go
+++ b/pkg/report/report.go
@@ -118,6 +118,7 @@ func NewReporter(cfg *mgrconfig.Config) (*Reporter, error) {
 	}
 	config := &config{
 		target:         cfg.SysTarget,
+		vmType:         cfg.Type,
 		kernelSrc:      cfg.KernelSrc,
 		kernelBuildSrc: cfg.KernelBuildSrc,
 		kernelObj:      cfg.KernelObj,
@@ -161,6 +162,7 @@ var ctors = map[string]fn{
 
 type config struct {
 	target         *targets.Target
+	vmType         string
 	kernelSrc      string
 	kernelBuildSrc string
 	kernelObj      string
-- 
cgit mrf-deployment