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

Merge "Check base property before using it" am: 83f107cdfb

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

Change-Id: I12b2bf1485a4dc7fdb6664de15a422bf257152f1
This commit is contained in:
Jooyung Han
2020-06-25 03:31:18 +00:00
committed by Automerger Merge Worker
parent 12db810dc7 83f107cdfb
commit 85164317ab
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) {