diff options
| -rw-r--r-- | android/apex.go | 14 | ||||
| -rw-r--r-- | apex/apex.go | 15 |
2 files changed, 1 insertions, 28 deletions
diff --git a/android/apex.go b/android/apex.go index db9391204..49db608a3 100644 --- a/android/apex.go +++ b/android/apex.go @@ -264,9 +264,6 @@ type ApexProperties struct { // Marker interface that identifies dependencies that are excluded from APEX contents. // -// Unless the tag also implements the AlwaysRequireApexVariantTag this will prevent an apex variant -// from being created for the module. -// // At the moment the sdk.sdkRequirementsMutator relies on the fact that the existing tags which // implement this interface do not define dependencies onto members of an sdk_snapshot. If that // changes then sdk.sdkRequirementsMutator will need fixing. @@ -277,17 +274,6 @@ type ExcludeFromApexContentsTag interface { ExcludeFromApexContents() } -// Marker interface that identifies dependencies that always requires an APEX variant to be created. -// -// It is possible for a dependency to require an apex variant but exclude the module from the APEX -// contents. See sdk.sdkMemberDependencyTag. -type AlwaysRequireApexVariantTag interface { - blueprint.DependencyTag - - // Return true if this tag requires that the target dependency has an apex variant. - AlwaysRequireApexVariant() bool -} - // Interface that identifies dependencies to skip Apex dependency check type SkipApexAllowedDependenciesCheck interface { // Returns true to skip the Apex dependency check, which limits the allowed dependency in build. diff --git a/apex/apex.go b/apex/apex.go index 5f700ee0e..acf290365 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -973,21 +973,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{}) |