diff options
Diffstat (limited to 'cc/fuzz.go')
| -rw-r--r-- | cc/fuzz.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/cc/fuzz.go b/cc/fuzz.go index 056b0dafe..bd3d8e431 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -244,7 +244,7 @@ func isValidSharedDependency(ctx android.ModuleContext, dependency android.Modul // libraries must be handled differently - by looking for the stubDecorator. // Discard LLNDK prebuilts stubs as well. if hasCcInfo { - if ccInfo.LinkerInfo.StubDecoratorInfo != nil { + if ccInfo.LinkerInfo != nil && ccInfo.LinkerInfo.StubDecoratorInfo != nil { return false } // Discard installable:false libraries because they are expected to be absent @@ -353,6 +353,7 @@ func PackageFuzzModule(ctx android.ModuleContext, fuzzPackagedModule fuzz.FuzzPa fuzzPackagedModule.Data = android.PathsForModuleSrc(ctx, fuzzPackagedModule.FuzzProperties.Data) fuzzPackagedModule.Data = append(fuzzPackagedModule.Data, android.PathsForModuleSrc(ctx, fuzzPackagedModule.FuzzProperties.Device_common_data)...) fuzzPackagedModule.Data = append(fuzzPackagedModule.Data, android.PathsForModuleSrc(ctx, fuzzPackagedModule.FuzzProperties.Device_first_data)...) + fuzzPackagedModule.Data = append(fuzzPackagedModule.Data, android.PathsForModuleSrc(ctx, fuzzPackagedModule.FuzzProperties.Host_common_data)...) if fuzzPackagedModule.FuzzProperties.Dictionary != nil { fuzzPackagedModule.Dictionary = android.PathForModuleSrc(ctx, *fuzzPackagedModule.FuzzProperties.Dictionary) |