Merge "'m fuzz' shared lib package should be per-fuzzer." am: 38dec1bcb5 am: fd869a69c7

am: 6796abbe9a

Change-Id: I2e2447898467f7101271449268bb0783ace96741

cc/fuzz.go

@@ -338,6 +338,9 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
 		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 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
 		}
 	})
 
-	// 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()))