Merge "fix: "no_apex" can be put in defaults"

This commit is contained in:
Jooyung Han
2019-09-26 01:07:21 +00:00
committed by Gerrit Code Review
3 changed files with 90 additions and 5 deletions

View File

@@ -1169,6 +1169,8 @@ func (a *apexBundle) GenerateAndroidBuildActions(ctx android.ModuleContext) {
}
} else if am.CanHaveApexVariants() && am.IsInstallableToApex() {
ctx.ModuleErrorf("unexpected tag %q for indirect dependency %q", depTag, depName)
} else if depTag == android.DefaultsDepTag {
return false
} else if am.NoApex() && !android.InList(depName, whitelistNoApex[ctx.ModuleName()]) {
ctx.ModuleErrorf("tries to include no_apex module %s", depName)
}