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

Merge "Check base property before using it"

Browse Source
This commit is contained in:
Jooyung Han
2020-06-25 03:13:16 +00:00
committed by Gerrit Code Review
parent 0acb0fb2b7 5c17ac003a
commit 83f107cdfb
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
android/override_module.go
View File

@@ -223,6 +223,11 @@ var overrideBaseDepTag overrideBaseDependencyTag
// next phase. // next phase.
func overrideModuleDepsMutator(ctx BottomUpMutatorContext) { func overrideModuleDepsMutator(ctx BottomUpMutatorContext) {
if module, ok := ctx.Module().(OverrideModule); ok { if module, ok := ctx.Module().(OverrideModule); ok {
base := String(module.getOverrideModuleProperties().Base)
if !ctx.OtherModuleExists(base) {
ctx.PropertyErrorf("base", "%q is not a valid module name", base)
return
}
// See if there's a prebuilt module that overrides this override module with prefer flag, // See if there's a prebuilt module that overrides this override module with prefer flag,
// in which case we call SkipInstall on the corresponding variant later. // in which case we call SkipInstall on the corresponding variant later.
ctx.VisitDirectDepsWithTag(PrebuiltDepTag, func(dep Module) { ctx.VisitDirectDepsWithTag(PrebuiltDepTag, func(dep Module) {