diff options
Diffstat (limited to 'cc/fuzz.go')
| -rw-r--r-- | cc/fuzz.go | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/cc/fuzz.go b/cc/fuzz.go index c19fdc5b0..e65e8ded7 100644 --- a/cc/fuzz.go +++ b/cc/fuzz.go @@ -148,10 +148,14 @@ func NewFuzz(hod android.HostOrDeviceSupported) *Module { // include the STL. android.AddLoadHook(module, func(ctx android.LoadHookContext) { staticStlLinkage := struct { - Stl *string + Target struct { + Linux_glibc struct { + Stl *string + } + } }{} - staticStlLinkage.Stl = proptools.StringPtr("libc++_static") + staticStlLinkage.Target.Linux_glibc.Stl = proptools.StringPtr("libc++_static") ctx.AppendProperties(&staticStlLinkage) }) @@ -211,7 +215,7 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) { // The corpora. for _, corpusEntry := range fuzzModule.corpus { archDirs[archDir] = append(archDirs[archDir], - fileToZip{corpusEntry, ccModule.Name() + "/corpus/" + corpusEntry.Base()}) + fileToZip{corpusEntry, ccModule.Name() + "/corpus"}) } // The dictionary. |