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

Merge "ShouldKeepExistingBuldFileForDir look up by dir" am: 1ad62c7073

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2301544

Change-Id: I940429ea17ad35a284fed5764143b5705add19b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Usta (Tsering) Shrestha
2022-11-19 04:18:21 +00:00
committed by Automerger Merge Worker
parent 84f5404a7e 1ad62c7073
commit 5daaffb9db
1 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
android/bazel.go
View File

@@ -341,17 +341,20 @@ func (a Bp2BuildConversionAllowlist) ShouldKeepExistingBuildFileForDir(dir strin
// Exact dir match // Exact dir match
return true return true
} }
var i int
// Check if subtree match // Check if subtree match
for prefix, recursive := range a.keepExistingBuildFile { for {
if recursive { j := strings.Index(dir[i:], "/")
if strings.HasPrefix(dir, prefix+"/") { if j == -1 {
return false //default
}
prefix := dir[0 : i+j]
i = i + j + 1 // skip the "/"
if recursive, ok := a.keepExistingBuildFile[prefix]; ok && recursive {
return true return true
} }
} }
} }
// Default
return false
}
var bp2BuildAllowListKey = NewOnceKey("Bp2BuildAllowlist") var bp2BuildAllowListKey = NewOnceKey("Bp2BuildAllowlist")
var bp2buildAllowlist OncePer var bp2buildAllowlist OncePer