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

Merge "Move aidl_camera_build_version to build number allowlist" into main

Browse Source
This commit is contained in:
Cole Faust
2024-08-28 16:59:54 +00:00
committed by Gerrit Code Review
parent 8afc9b6a59 f23fdc048e
commit 80a6541647
2 changed files with 18 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
genrule/allowlists.go
View File

@@ -17,7 +17,6 @@ package genrule
var ( var (
SandboxingDenyModuleList = []string{ SandboxingDenyModuleList = []string{
// go/keep-sorted start // go/keep-sorted start
"aidl_camera_build_version",
"com.google.pixel.camera.hal.manifest", "com.google.pixel.camera.hal.manifest",
// go/keep-sorted end // go/keep-sorted end
} }

22
genrule/genrule.go
View File

@@ -243,13 +243,27 @@ func toolDepsMutator(ctx android.BottomUpMutatorContext) {
} }
} }
var buildNumberAllowlistKey = android.NewOnceKey("genruleBuildNumberAllowlistKey")
// This allowlist should be kept to the bare minimum, it's // This allowlist should be kept to the bare minimum, it's
// intended for things that existed before the build number // intended for things that existed before the build number
// was tightly controlled. Prefer using libbuildversion // was tightly controlled. Prefer using libbuildversion
// via the use_version_lib property of cc modules. // via the use_version_lib property of cc modules.
var genrule_build_number_allowlist = map[string]bool{ // This is a function instead of a global map so that
"build/soong/tests:gen": true, // soong plugins cannot add entries to the allowlist
"tools/tradefederation/core:tradefed_zip": true, func isModuleInBuildNumberAllowlist(ctx android.ModuleContext) bool {
allowlist := ctx.Config().Once(buildNumberAllowlistKey, func() interface{} {
return map[string]bool{
// go/keep-sorted start
"build/soong/tests:gen": true,
"hardware/google/camera/common/hal/aidl_service:aidl_camera_build_version": true,
"tools/tradefederation/core:tradefed_zip": true,
// go/keep-sorted end
}
}).(map[string]bool)
_, ok := allowlist[ctx.ModuleDir()+":"+ctx.ModuleName()]
return ok
} }
// generateCommonBuildActions contains build action generation logic // generateCommonBuildActions contains build action generation logic
@@ -547,7 +561,7 @@ func (g *Module) generateCommonBuildActions(ctx android.ModuleContext) {
cmd.ImplicitTools(tools) cmd.ImplicitTools(tools)
cmd.ImplicitPackagedTools(packagedTools) cmd.ImplicitPackagedTools(packagedTools)
if proptools.Bool(g.properties.Uses_order_only_build_number_file) { if proptools.Bool(g.properties.Uses_order_only_build_number_file) {
if _, ok := genrule_build_number_allowlist[ctx.ModuleDir()+":"+ctx.ModuleName()]; !ok { if !isModuleInBuildNumberAllowlist(ctx) {
ctx.ModuleErrorf("Only allowlisted modules may use uses_order_only_build_number_file: true") ctx.ModuleErrorf("Only allowlisted modules may use uses_order_only_build_number_file: true")
} }
cmd.OrderOnly(ctx.Config().BuildNumberFile(ctx)) cmd.OrderOnly(ctx.Config().BuildNumberFile(ctx))