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

cosmetics

Browse Source 
Test: m --bazel-mode nothing
Bug: b/239044236
Change-Id: Iaffc315c696f2fa19a2525009010d5964cf5a7d1
This commit is contained in:
Usta Shrestha
2022-10-17 17:36:49 -04:00
committed by Usta (Tsering) Shrestha
parent 7c4ef0718c
commit 49d04e89d8
1 changed files with 5 additions and 12 deletions
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 {