Merge "'m fuzz' shared lib package should be per-fuzzer." (38dec1bc) · Commits · e / os / android_build_soong

cc/fuzz.go

+3 −6

Original line number	Diff line number	Diff line
		@@ -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()))