summaryrefslogtreecommitdiff
path: root/apex
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2024-11-19 11:29:46 -0800
committer Colin Cross <ccross@android.com> 2024-11-20 11:17:30 -0800
commitf6978173131245bac18297e4ee5d43d74ffc9ed5 (patch)
tree96bc52d625b356e3ed45076a55c547de79cf71b0 /apex
parentbb674a1970459b82246e1815b085d6c192c68086 (diff)
Remove InApexModules
The only use of InApexModules was a container check that verified that apexes didn't depend on non-stubs modules from outside the apex. Switch it to InApexVariants for now, although that will also need to be removed. Bug: 372543712 Test: builds Change-Id: I822e982e3e8767dc251c8341de9f40373982c6ed
Diffstat (limited to 'apex')
-rw-r--r--apex/apex.go1
-rw-r--r--apex/prebuilt.go1
2 files changed, 0 insertions, 2 deletions
diff --git a/apex/apex.go b/apex/apex.go
index 7f259a808..a58822edc 100644
--- a/apex/apex.go
+++ b/apex/apex.go
@@ -1020,7 +1020,6 @@ func (a *apexBundle) ApexInfoMutator(mctx android.TopDownMutatorContext) {
Updatable: a.Updatable(),
UsePlatformApis: a.UsePlatformApis(),
InApexVariants: []string{apexVariationName},
- InApexModules: []string{a.Name()}, // could be com.mycompany.android.foo
TestApexes: testApexes,
BaseApexName: mctx.ModuleName(),
ApexAvailableName: proptools.String(a.properties.Apex_available_name),
diff --git a/apex/prebuilt.go b/apex/prebuilt.go
index 2bef0cccf..f93eada8b 100644
--- a/apex/prebuilt.go
+++ b/apex/prebuilt.go
@@ -356,7 +356,6 @@ func (p *prebuiltCommon) apexInfoMutator(mctx android.TopDownMutatorContext) {
apexInfo := android.ApexInfo{
ApexVariationName: apexVariationName,
InApexVariants: []string{apexVariationName},
- InApexModules: []string{p.BaseModuleName()}, // BaseModuleName() to avoid the prebuilt_ prefix.
ForPrebuiltApex: true,
}