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

Merge "Improve dynamic inherit paths handling" am: 408a4bece5

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

Change-Id: I5ae87fccc81847956b0e633274989b566b664af2
This commit is contained in:
Alexander Smundak
2021-08-03 20:36:12 +00:00
committed by Automerger Merge Worker
parent d793c89474 408a4bece5
commit 683ee70403
1 changed files with 11 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
mk2rbc/mk2rbc.go
View File

@@ -805,14 +805,20 @@ func (ctx *parseContext) handleSubConfig(
matchingPaths = ctx.findMatchingPaths(pathPattern)
} else {
// Heuristics -- if pattern starts from top, restrict it to the directories where
// we know inherit-product uses dynamically calculated path.
for _, t := range []string{"vendor/qcom", "vendor/google_devices"} {
pathPattern[0] = t
matchingPaths = append(matchingPaths, ctx.findMatchingPaths(pathPattern)...)
// we know inherit-product uses dynamically calculated path. Restrict it even further
// for certain path which would yield too many useless matches
if len(varPath.chunks) == 2 && varPath.chunks[1] == "/BoardConfigVendor.mk" {
pathPattern[0] = "vendor/google_devices"
matchingPaths = ctx.findMatchingPaths(pathPattern)
} else {
for _, t := range []string{"vendor/qcom", "vendor/google_devices"} {
pathPattern[0] = t
matchingPaths = append(matchingPaths, ctx.findMatchingPaths(pathPattern)...)
}
}
}
// Safeguard against $(call inherit-product,$(PRODUCT_PATH))
const maxMatchingFiles = 100
const maxMatchingFiles = 150
if len(matchingPaths) > maxMatchingFiles {
ctx.errorf(v, "there are >%d files matching the pattern, please rewrite it", maxMatchingFiles)
return