tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "cosmetics"

Browse source
This commit is contained in:
Usta (Tsering) Shrestha 2022-10-25 01:37:23 +00:00 committed by Gerrit Code Review
commit a0e575c7dc
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
bp2build/symlink_forest.go
View file

@ -202,13 +202,13 @@ func plantSymlinkForestRecursive(cfg android.Config, topdir string, forestDir st
} }
} }
allEntries := make(map[string]bool) allEntries := make(map[string]struct{})
for n := range srcDirMap { for n := range srcDirMap {
allEntries[n] = true allEntries[n] = struct{}{}
} }
for n := range buildFilesMap { for n := range buildFilesMap {
allEntries[n] = true allEntries[n] = struct{}{}
} }
err := os.MkdirAll(shared.JoinPath(topdir, forestDir), 0777) err := os.MkdirAll(shared.JoinPath(topdir, forestDir), 0777)
@ -250,15 +250,8 @@ func plantSymlinkForestRecursive(cfg android.Config, topdir string, forestDir st
continue continue
} }
sDir := false sDir := sExists && isDir(shared.JoinPath(topdir, srcChild), srcChildEntry)
bDir := false bDir := bExists && isDir(shared.JoinPath(topdir, buildFilesChild), buildFilesChildEntry)
if sExists {
sDir = isDir(shared.JoinPath(topdir, srcChild), srcChildEntry)
}
if bExists {
bDir = isDir(shared.JoinPath(topdir, buildFilesChild), buildFilesChildEntry)
}
if !sExists { if !sExists {
if bDir && excludeChild != nil { if bDir && excludeChild != nil {