Merge "'m fuzz' shared lib package should be per-fuzzer."
diff --git a/cc/fuzz.go b/cc/fuzz.go
index 11e6413..4b537c0 100644
--- a/cc/fuzz.go
+++ b/cc/fuzz.go
@@ -338,6 +338,9 @@
collectAllSharedDependencies(module, sharedLibraries, ctx)
for _, library := range sharedLibraries {
+ archDirs[archDir] = append(archDirs[archDir],
+ fileToZip{library, ccModule.Name() + "/lib"})
+
if _, exists := archSharedLibraryDeps[archAndLibraryKey{archDir, library}]; exists {
continue
}
@@ -379,12 +382,6 @@
}
})
- // Add the shared library deps for packaging.
- for key, _ := range archSharedLibraryDeps {
- archDirs[key.ArchDir] = append(archDirs[key.ArchDir],
- fileToZip{key.Library, "lib"})
- }
-
for archDir, filesToZip := range archDirs {
arch := archDir.Base()
hostOrTarget := filepath.Base(filepath.Dir(archDir.String()))