Make the enabled property configurable
This allows using select statements with it. Bug: 323382414 Test: m nothing --no-skip-soong-tests Change-Id: I6f3efaaa3d82505e38a91ee4ba0e18e404360191 Merged-In: If355d24506e3f117d27b21442a6c02bca3402dc7
This commit is contained in:
@@ -486,7 +486,7 @@ func osMutator(bpctx blueprint.BottomUpMutatorContext) {
|
||||
// dependencies on OsType variants that are explicitly disabled in their
|
||||
// properties. The CommonOS variant will still depend on disabled variants
|
||||
// if they are disabled afterwards, e.g. in archMutator if
|
||||
if module.Enabled() {
|
||||
if module.Enabled(mctx) {
|
||||
mctx.AddInterVariantDependency(commonOsToOsSpecificVariantTag, commonOSVariant, module)
|
||||
}
|
||||
}
|
||||
@@ -511,7 +511,7 @@ func GetOsSpecificVariantsOfCommonOSVariant(mctx BaseModuleContext) []Module {
|
||||
var variants []Module
|
||||
mctx.VisitDirectDeps(func(m Module) {
|
||||
if mctx.OtherModuleDependencyTag(m) == commonOsToOsSpecificVariantTag {
|
||||
if m.Enabled() {
|
||||
if m.Enabled(mctx) {
|
||||
variants = append(variants, m)
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user