diff options
author | Colin Cross <ccross@android.com> | 2020-01-02 14:37:02 -0800 |
---|---|---|
committer | Colin Cross <ccross@android.com> | 2020-01-03 17:21:04 +0000 |
commit | 87f790c5091b596b542ccd1a4bc8921bdd01983e (patch) | |
tree | 480aaeb4d9f25b5c683770714e76ac6b52cbc3c9 | |
parent | 36809d52baa06b0ea9005b5a076225e3d1a30e50 (diff) | |
download | build_soong-87f790c5091b596b542ccd1a4bc8921bdd01983e.tar.gz build_soong-87f790c5091b596b542ccd1a4bc8921bdd01983e.tar.bz2 build_soong-87f790c5091b596b542ccd1a4bc8921bdd01983e.zip |
Delete arch hooks
They are not used anywhere.
Test: m checkbuild
Change-Id: Ice7d68b97ca894c0c4c9efc6dc55c0870a132b9c
-rw-r--r-- | android/hooks.go | 34 | ||||
-rw-r--r-- | android/mutator.go | 1 |
2 files changed, 0 insertions, 35 deletions
diff --git a/android/hooks.go b/android/hooks.go index 604cb9c2..0e0f5a45 100644 --- a/android/hooks.go +++ b/android/hooks.go @@ -33,24 +33,11 @@ type LoadHookContext interface { CreateModule(ModuleFactory, ...interface{}) Module } -// Arch hooks are run after the module has been split into architecture variants, and can be used -// to add architecture-specific properties. -type ArchHookContext interface { - BaseModuleContext - AppendProperties(...interface{}) - PrependProperties(...interface{}) -} - func AddLoadHook(m blueprint.Module, hook func(LoadHookContext)) { h := &m.(Module).base().hooks h.load = append(h.load, hook) } -func AddArchHook(m blueprint.Module, hook func(ArchHookContext)) { - h := &m.(Module).base().hooks - h.arch = append(h.arch, hook) -} - func (x *hooks) runLoadHooks(ctx LoadHookContext, m *ModuleBase) { if len(x.load) > 0 { for _, x := range x.load { @@ -62,17 +49,6 @@ func (x *hooks) runLoadHooks(ctx LoadHookContext, m *ModuleBase) { } } -func (x *hooks) runArchHooks(ctx ArchHookContext, m *ModuleBase) { - if len(x.arch) > 0 { - for _, x := range x.arch { - x(ctx) - if ctx.Failed() { - return - } - } - } -} - type InstallHookContext interface { ModuleContext Path() InstallPath @@ -119,7 +95,6 @@ func (x *hooks) runInstallHooks(ctx ModuleContext, path InstallPath, symlink boo type hooks struct { load []func(LoadHookContext) - arch []func(ArchHookContext) install []func(InstallHookContext) } @@ -137,12 +112,3 @@ func LoadHookMutator(ctx TopDownMutatorContext) { m.base().hooks.runLoadHooks(loadHookCtx, m.base()) } } - -func archHookMutator(ctx TopDownMutatorContext) { - if m, ok := ctx.Module().(Module); ok { - // Cast through *topDownMutatorContext because AppendProperties is implemented - // on *topDownMutatorContext but not exposed through TopDownMutatorContext - var archHookCtx ArchHookContext = ctx.(*topDownMutatorContext) - m.base().hooks.runArchHooks(archHookCtx, m.base()) - } -} diff --git a/android/mutator.go b/android/mutator.go index c2bae44c..709d9c09 100644 --- a/android/mutator.go +++ b/android/mutator.go @@ -89,7 +89,6 @@ func registerArchMutator(ctx RegisterMutatorsContext) { ctx.BottomUp("os", osMutator).Parallel() ctx.BottomUp("image", imageMutator).Parallel() ctx.BottomUp("arch", archMutator).Parallel() - ctx.TopDown("arch_hooks", archHookMutator).Parallel() } var preDeps = []RegisterMutatorFunc{ |