Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 809aaeb9 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge changes I41978037,I19e8a9e8 into main 

* changes:
  Properly initialize android_system_image modules
  Add otherModuleProvider to ConfigurableEvaluatorContext
parents e9523242 2cfe696f

android/defaults.go

+1 −0
Original line number Diff line number Diff line
@@ -101,6 +101,7 @@ func InitDefaultableModule(module DefaultableModule) { 
// A restricted subset of context methods, similar to LoadHookContext.

type DefaultableHookContext interface {

	EarlyModuleContext

	OtherModuleProviderContext



	CreateModule(ModuleFactory, ...interface{}) Module

	AddMissingDependencies(missingDeps []string)

android/module.go

+1 −0
Original line number Diff line number Diff line
@@ -2211,6 +2211,7 @@ type ConfigContext interface { 
}



type ConfigurableEvaluatorContext interface {

	OtherModuleProviderContext

	Config() Config

	OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{})

	HasMutatorFinished(mutatorName string) bool

android/paths.go

+1 −0
Original line number Diff line number Diff line
@@ -91,6 +91,7 @@ func GlobFiles(ctx EarlyModulePathContext, globPattern string, excludes []string 
// the Path methods that rely on module dependencies having been resolved.

type ModuleWithDepsPathContext interface {

	EarlyModulePathContext

	OtherModuleProviderContext

	VisitDirectDepsBlueprint(visit func(blueprint.Module))

	OtherModuleDependencyTag(m blueprint.Module) blueprint.DependencyTag

	HasMutatorFinished(mutatorName string) bool

android/testing.go

+4 −0
Original line number Diff line number Diff line
@@ -1330,6 +1330,10 @@ func (ctx *panickingConfigAndErrorContext) HasMutatorFinished(mutatorName string 
	return ctx.ctx.HasMutatorFinished(mutatorName)

}



func (ctx *panickingConfigAndErrorContext) otherModuleProvider(m blueprint.Module, p blueprint.AnyProviderKey) (any, bool) {

	return ctx.ctx.otherModuleProvider(m, p)

}



func PanickingConfigAndErrorContext(ctx *TestContext) ConfigurableEvaluatorContext {

	return &panickingConfigAndErrorContext{

		ctx: ctx,

filesystem/filesystem.go

+5 −5
Original line number Diff line number Diff line
@@ -147,14 +147,14 @@ type filesystemProperties struct { 
func filesystemFactory() android.Module {

	module := &filesystem{}

	module.filterPackagingSpec = module.filterInstallablePackagingSpec

	initFilesystemModule(module)

	initFilesystemModule(module, module)

	return module

}



func initFilesystemModule(module *filesystem) {

	module.AddProperties(&module.properties)

	android.InitPackageModule(module)

	module.PackagingBase.DepsCollectFirstTargetOnly = true

func initFilesystemModule(module android.DefaultableModule, filesystemModule *filesystem) {

	module.AddProperties(&filesystemModule.properties)

	android.InitPackageModule(filesystemModule)

	filesystemModule.PackagingBase.DepsCollectFirstTargetOnly = true

	android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)

	android.InitDefaultableModule(module)

}