diff options
| author | 2024-09-24 02:56:09 +0000 | |
|---|---|---|
| committer | 2024-09-24 02:56:09 +0000 | |
| commit | 3961bb8fb20399e099dd2ee38fc7fd14355ce14f (patch) | |
| tree | da46b5e5f8f23a454d1c929e26660b1f86b87a96 | |
| parent | 6dbdccea4a4a7f8bbdbd9be01fa08709cb492d0c (diff) | |
| parent | faa827deee72d6f8683e725d0d4d919e5c12af23 (diff) | |
Merge "Remove `prebuilt_apex_module_creator` mutator" into main am: edefa90d42 am: faa827deee
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3277436
Change-Id: I7354bcbc135ac73577c4a35005e69c7507892fab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | apex/apex.go | 5 | ||||
| -rw-r--r-- | apex/prebuilt.go | 22 |
2 files changed, 0 insertions, 27 deletions
diff --git a/apex/apex.go b/apex/apex.go index e29f27e4a..d3c1ed016 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 d3f14f9c0..9cd5688ba 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 |