StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "'m fuzz' shared lib package should be per-fuzzer."

Browse Source
This commit is contained in:
Treehugger Robot
2019-11-12 22:13:36 +00:00
committed by Gerrit Code Review
parent 69c013694d 13ed3f5e34
commit 38dec1bcb5
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
cc/fuzz.go
View File

@@ -338,6 +338,9 @@ func (s *fuzzPackager) GenerateBuildActions(ctx android.SingletonContext) {
collectAllSharedDependencies(module, sharedLibraries, ctx) collectAllSharedDependencies(module, sharedLibraries, ctx)
for _, library := range sharedLibraries { for _, library := range sharedLibraries {
archDirs[archDir] = append(archDirs[archDir],
fileToZip{library, ccModule.Name() + "/lib"})
if _, exists := archSharedLibraryDeps[archAndLibraryKey{archDir, library}]; exists { if _, exists := archSharedLibraryDeps[archAndLibraryKey{archDir, library}]; exists {
continue 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 { for archDir, filesToZip := range archDirs {
arch := archDir.Base() arch := archDir.Base()
hostOrTarget := filepath.Base(filepath.Dir(archDir.String())) hostOrTarget := filepath.Base(filepath.Dir(archDir.String()))