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

Merge "Add com.google.pixel.camera.hal.manifest to build number allowlist" into main

Browse Source
This commit is contained in:
Treehugger Robot
2024-08-28 21:28:55 +00:00
committed by Gerrit Code Review
parent ce531ba405 dc0187811f
commit f5a03c7957
1 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
genrule/genrule.go
View File

@@ -253,13 +253,21 @@ var buildNumberAllowlistKey = android.NewOnceKey("genruleBuildNumberAllowlistKey
// soong plugins cannot add entries to the allowlist // soong plugins cannot add entries to the allowlist
func isModuleInBuildNumberAllowlist(ctx android.ModuleContext) bool { func isModuleInBuildNumberAllowlist(ctx android.ModuleContext) bool {
allowlist := ctx.Config().Once(buildNumberAllowlistKey, func() interface{} { allowlist := ctx.Config().Once(buildNumberAllowlistKey, func() interface{} {
return map[string]bool{ // Define the allowlist as a list and then copy it into a map so that
// gofmt doesn't change unnecessary lines trying to align the values of the map.
allowlist := []string{
// go/keep-sorted start // go/keep-sorted start
"build/soong/tests:gen": true, "build/soong/tests:gen",
"hardware/google/camera/common/hal/aidl_service:aidl_camera_build_version": true, "hardware/google/camera/common/hal/aidl_service:aidl_camera_build_version",
"tools/tradefederation/core:tradefed_zip": true, "tools/tradefederation/core:tradefed_zip",
"vendor/google/services/LyricCameraHAL/src/apex:com.google.pixel.camera.hal.manifest",
// go/keep-sorted end // go/keep-sorted end
} }
allowlistMap := make(map[string]bool, len(allowlist))
for _, a := range allowlist {
allowlistMap[a] = true
}
return allowlistMap
}).(map[string]bool) }).(map[string]bool)
_, ok := allowlist[ctx.ModuleDir()+":"+ctx.ModuleName()] _, ok := allowlist[ctx.ModuleDir()+":"+ctx.ModuleName()]