Add recovery_available to prebuilt_etc.
The property is similar to the ones for cc_*, where it can additionally create a recovery variant of the module when used. Bug: 112780007 Test: Build mke2fs.conf with `recovery_available: true`. Test: `go test -run TestPrebuiltEtc` Change-Id: Ia04360d00453fa1f80022301feb369514f5e2b0b
This commit is contained in:
@@ -24,6 +24,10 @@ import (
|
||||
|
||||
func init() {
|
||||
RegisterModuleType("prebuilt_etc", PrebuiltEtcFactory)
|
||||
|
||||
PreDepsMutators(func(ctx RegisterMutatorsContext) {
|
||||
ctx.BottomUp("prebuilt_etc", prebuiltEtcMutator).Parallel()
|
||||
})
|
||||
}
|
||||
|
||||
type prebuiltEtcProperties struct {
|
||||
@@ -32,6 +36,11 @@ type prebuiltEtcProperties struct {
|
||||
|
||||
// optional subdirectory under which this file is installed into
|
||||
Sub_dir *string `android:"arch_variant"`
|
||||
|
||||
// Make this module available when building for recovery.
|
||||
Recovery_available *bool
|
||||
|
||||
InRecovery bool `blueprint:"mutated"`
|
||||
}
|
||||
|
||||
type PrebuiltEtc struct {
|
||||
@@ -44,6 +53,18 @@ type PrebuiltEtc struct {
|
||||
additionalDependencies *Paths
|
||||
}
|
||||
|
||||
func (p *PrebuiltEtc) inRecovery() bool {
|
||||
return p.properties.InRecovery || p.ModuleBase.InstallInRecovery()
|
||||
}
|
||||
|
||||
func (p *PrebuiltEtc) onlyInRecovery() bool {
|
||||
return p.ModuleBase.InstallInRecovery()
|
||||
}
|
||||
|
||||
func (p *PrebuiltEtc) InstallInRecovery() bool {
|
||||
return p.inRecovery()
|
||||
}
|
||||
|
||||
func (p *PrebuiltEtc) DepsMutator(ctx BottomUpMutatorContext) {
|
||||
if p.properties.Src == nil {
|
||||
ctx.PropertyErrorf("src", "missing prebuilt source file")
|
||||
@@ -71,9 +92,13 @@ func (p *PrebuiltEtc) GenerateAndroidBuildActions(ctx ModuleContext) {
|
||||
func (p *PrebuiltEtc) AndroidMk() AndroidMkData {
|
||||
return AndroidMkData{
|
||||
Custom: func(w io.Writer, name, prefix, moduleDir string, data AndroidMkData) {
|
||||
nameSuffix := ""
|
||||
if p.inRecovery() && !p.onlyInRecovery() {
|
||||
nameSuffix = ".recovery"
|
||||
}
|
||||
fmt.Fprintln(w, "\ninclude $(CLEAR_VARS)")
|
||||
fmt.Fprintln(w, "LOCAL_PATH :=", moduleDir)
|
||||
fmt.Fprintln(w, "LOCAL_MODULE :=", name)
|
||||
fmt.Fprintln(w, "LOCAL_MODULE :=", name+nameSuffix)
|
||||
fmt.Fprintln(w, "LOCAL_MODULE_CLASS := ETC")
|
||||
fmt.Fprintln(w, "LOCAL_MODULE_TAGS := optional")
|
||||
fmt.Fprintln(w, "LOCAL_PREBUILT_MODULE_FILE :=", p.sourceFilePath.String())
|
||||
@@ -101,3 +126,46 @@ func PrebuiltEtcFactory() Module {
|
||||
InitAndroidArchModule(module, DeviceSupported, MultilibCommon)
|
||||
return module
|
||||
}
|
||||
|
||||
const (
|
||||
// coreMode is the variant for modules to be installed to system.
|
||||
coreMode = "core"
|
||||
|
||||
// recoveryMode means a module to be installed to recovery image.
|
||||
recoveryMode = "recovery"
|
||||
)
|
||||
|
||||
// prebuiltEtcMutator creates the needed variants to install the module to
|
||||
// system or recovery.
|
||||
func prebuiltEtcMutator(mctx BottomUpMutatorContext) {
|
||||
m, ok := mctx.Module().(*PrebuiltEtc)
|
||||
if !ok {
|
||||
return
|
||||
}
|
||||
|
||||
var coreVariantNeeded bool = true
|
||||
var recoveryVariantNeeded bool = false
|
||||
if Bool(m.properties.Recovery_available) {
|
||||
recoveryVariantNeeded = true
|
||||
}
|
||||
|
||||
if m.ModuleBase.InstallInRecovery() {
|
||||
recoveryVariantNeeded = true
|
||||
coreVariantNeeded = false
|
||||
}
|
||||
|
||||
var variants []string
|
||||
if coreVariantNeeded {
|
||||
variants = append(variants, coreMode)
|
||||
}
|
||||
if recoveryVariantNeeded {
|
||||
variants = append(variants, recoveryMode)
|
||||
}
|
||||
mod := mctx.CreateVariations(variants...)
|
||||
for i, v := range variants {
|
||||
if v == recoveryMode {
|
||||
m := mod[i].(*PrebuiltEtc)
|
||||
m.properties.InRecovery = true
|
||||
}
|
||||
}
|
||||
}
|
||||
|
Reference in New Issue
Block a user