From 309a612c9f602c9021989c607a91917194d18e77 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Mon, 23 Sep 2024 23:03:18 +0000 Subject: [PATCH] Remove `prebuilt_apex_module_creator` mutator prebuilt apex modules no longer create internal modules, so this mutator is not necessary. Test: go build ./apex Change-Id: I12c08b8f36efab8a9898341052b6f3cd26a0e803 --- apex/apex.go | 5 ----- apex/prebuilt.go | 22 ---------------------- 2 files changed, 27 deletions(-) diff --git a/apex/apex.go b/apex/apex.go index 9e3f288ce0..9e9b9f202e 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -49,15 +49,10 @@ func registerApexBuildComponents(ctx android.RegistrationContext) { ctx.RegisterModuleType("override_apex", OverrideApexFactory) ctx.RegisterModuleType("apex_set", apexSetFactory) - ctx.PreArchMutators(registerPreArchMutators) ctx.PreDepsMutators(RegisterPreDepsMutators) ctx.PostDepsMutators(RegisterPostDepsMutators) } -func registerPreArchMutators(ctx android.RegisterMutatorsContext) { - ctx.BottomUp("prebuilt_apex_module_creator", prebuiltApexModuleCreatorMutator).Parallel() -} - func RegisterPreDepsMutators(ctx android.RegisterMutatorsContext) { ctx.BottomUp("apex_vndk_deps", apexVndkDepsMutator).Parallel() } diff --git a/apex/prebuilt.go b/apex/prebuilt.go index d3f14f9c09..9cd5688ba5 100644 --- a/apex/prebuilt.go +++ b/apex/prebuilt.go @@ -253,28 +253,6 @@ func (p *prebuiltCommon) AndroidMkEntries() []android.AndroidMkEntries { return entriesList } -// DEPRECATED. // TODO (spandandas): Remove this interface. - -// prebuiltApexModuleCreator defines the methods that need to be implemented by prebuilt_apex and -// apex_set in order to create the modules needed to provide access to the prebuilt .apex file. -type prebuiltApexModuleCreator interface { - createPrebuiltApexModules(ctx android.BottomUpMutatorContext) -} - -// prebuiltApexModuleCreatorMutator is the mutator responsible for invoking the -// prebuiltApexModuleCreator's createPrebuiltApexModules method. -// -// It is registered as a pre-arch mutator as it must run after the ComponentDepsMutator because it -// will need to access dependencies added by that (exported modules) but must run before the -// DepsMutator so that the deapexer module it creates can add dependencies onto itself from the -// exported modules. -func prebuiltApexModuleCreatorMutator(ctx android.BottomUpMutatorContext) { - module := ctx.Module() - if creator, ok := module.(prebuiltApexModuleCreator); ok { - creator.createPrebuiltApexModules(ctx) - } -} - func (p *prebuiltCommon) hasExportedDeps() bool { return len(p.prebuiltCommonProperties.Exported_bootclasspath_fragments) > 0 || len(p.prebuiltCommonProperties.Exported_systemserverclasspath_fragments) > 0