diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 17 |
1 files changed, 2 insertions, 15 deletions
diff --git a/apex/apex.go b/apex/apex.go index 9fdb2a2a5..c6b62b58c 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -966,21 +966,8 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) { if !ok || !am.CanHaveApexVariants() { return false } - depTag := mctx.OtherModuleDependencyTag(child) - // Check to see if the tag always requires that the child module has an apex variant for every - // apex variant of the parent module. If it does not then it is still possible for something - // else, e.g. the DepIsInSameApex(...) method to decide that a variant is required. - if required, ok := depTag.(android.AlwaysRequireApexVariantTag); ok && required.AlwaysRequireApexVariant() { - return true - } - if !android.IsDepInSameApex(mctx, parent, child) { - return false - } - - // By default, all the transitive dependencies are collected, unless filtered out - // above. - return true + return android.IsDepInSameApex(mctx, parent, child) } android.SetProvider(mctx, android.ApexBundleInfoProvider, android.ApexBundleInfo{}) @@ -2695,7 +2682,7 @@ func (a *apexBundle) checkApexAvailability(ctx android.ModuleContext) { return } - a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool { + a.WalkPayloadDeps(ctx, func(ctx android.BaseModuleContext, from android.Module, to android.ApexModule, externalDep bool) bool { // As soon as the dependency graph crosses the APEX boundary, don't go further. if externalDep { return false |