From 1a842010981c1cb747199574fd8f60e288bf0eb4 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 3 Dec 2024 16:05:57 -0800 Subject: Remove AlwaysRequireApexVariantTag Nothing implements AlwaysRequireApexVariantTag, remove it. Bug: 372543712 Test: builds Change-Id: Ie438d7a79e171f398b36ce1938249eb3145fcc9b --- apex/apex.go | 15 +-------------- 1 file changed, 1 insertion(+), 14 deletions(-) (limited to 'apex/apex.go') 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{}) -- cgit v1.2.3-59-g8ed1b From 9cf55a538b07d2e76b993bf3eb44b2e72f9ddcc3 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Thu, 5 Dec 2024 14:26:03 -0800 Subject: Convert WalkPayloadDeps from blueprint.Module to android.Module All modules in Soong are now android.Module, there is no need to use blueprint.Module. Test: builds Change-Id: I859cd6360732e3d195a634736ec515d240323f29 --- android/apex.go | 4 ++-- apex/apex.go | 2 +- java/app.go | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) (limited to 'apex/apex.go') diff --git a/android/apex.go b/android/apex.go index 49db608a3..f625bafcc 100644 --- a/android/apex.go +++ b/android/apex.go @@ -764,7 +764,7 @@ func (d *ApexBundleDepsInfo) BuildDepsInfoLists(ctx ModuleContext, minSdkVersion // Function called while walking an APEX's payload dependencies. // // Return true if the `to` module should be visited, false otherwise. -type PayloadDepsCallback func(ctx BaseModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool +type PayloadDepsCallback func(ctx BaseModuleContext, from Module, to ApexModule, externalDep bool) bool type WalkPayloadDepsFunc func(ctx BaseModuleContext, do PayloadDepsCallback) // ModuleWithMinSdkVersionCheck represents a module that implements min_sdk_version checks @@ -792,7 +792,7 @@ func CheckMinSdkVersion(ctx ModuleContext, minSdkVersion ApiLevel, walk WalkPayl return } - walk(ctx, func(ctx BaseModuleContext, from blueprint.Module, to ApexModule, externalDep bool) bool { + walk(ctx, func(ctx BaseModuleContext, from Module, to ApexModule, externalDep bool) bool { if externalDep { // external deps are outside the payload boundary, which is "stable" // interface. We don't have to check min_sdk_version for external diff --git a/apex/apex.go b/apex/apex.go index acf290365..e22cf9ea6 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2694,7 +2694,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 diff --git a/java/app.go b/java/app.go index bedb45c5e..276e9606d 100644 --- a/java/app.go +++ b/java/app.go @@ -1225,7 +1225,7 @@ func (a *AndroidApp) buildAppDependencyInfo(ctx android.ModuleContext) { } depsInfo := android.DepNameToDepInfoMap{} - 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 { depName := to.Name() // Skip dependencies that are only available to APEXes; they are developed with updatability -- cgit v1.2.3-59-g8ed1b