StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I41978037,I19e8a9e8 into main am: 809aaeb90b

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3266866

Change-Id: I0ea36a81d256d4a82124e4266818a1c8b8b135ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Treehugger Robot
2024-09-17 20:52:19 +00:00
committed by Automerger Merge Worker
parent b8cc10da46 809aaeb90b
commit df86e9ee4f
6 changed files with 13 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
android/defaults.go
View File

@@ -101,6 +101,7 @@ func InitDefaultableModule(module DefaultableModule) {
// A restricted subset of context methods, similar to LoadHookContext. // A restricted subset of context methods, similar to LoadHookContext.
type DefaultableHookContext interface { type DefaultableHookContext interface {
EarlyModuleContext EarlyModuleContext
OtherModuleProviderContext
CreateModule(ModuleFactory, ...interface{}) Module CreateModule(ModuleFactory, ...interface{}) Module
AddMissingDependencies(missingDeps []string) AddMissingDependencies(missingDeps []string)

1
android/module.go
View File

@@ -2211,6 +2211,7 @@ type ConfigContext interface {
} }
type ConfigurableEvaluatorContext interface { type ConfigurableEvaluatorContext interface {
OtherModuleProviderContext
Config() Config Config() Config
OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{}) OtherModulePropertyErrorf(module Module, property string, fmt string, args ...interface{})
HasMutatorFinished(mutatorName string) bool HasMutatorFinished(mutatorName string) bool

1
android/paths.go
View File

@@ -91,6 +91,7 @@ func GlobFiles(ctx EarlyModulePathContext, globPattern string, excludes []string
// the Path methods that rely on module dependencies having been resolved. // the Path methods that rely on module dependencies having been resolved.
type ModuleWithDepsPathContext interface { type ModuleWithDepsPathContext interface {
EarlyModulePathContext EarlyModulePathContext
OtherModuleProviderContext
VisitDirectDepsBlueprint(visit func(blueprint.Module)) VisitDirectDepsBlueprint(visit func(blueprint.Module))
OtherModuleDependencyTag(m blueprint.Module) blueprint.DependencyTag OtherModuleDependencyTag(m blueprint.Module) blueprint.DependencyTag
HasMutatorFinished(mutatorName string) bool HasMutatorFinished(mutatorName string) bool

4
android/testing.go
View File

@@ -1330,6 +1330,10 @@ func (ctx *panickingConfigAndErrorContext) HasMutatorFinished(mutatorName string
return ctx.ctx.HasMutatorFinished(mutatorName) 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 { func PanickingConfigAndErrorContext(ctx *TestContext) ConfigurableEvaluatorContext {
return &panickingConfigAndErrorContext{ return &panickingConfigAndErrorContext{
ctx: ctx, ctx: ctx,

10
filesystem/filesystem.go
View File

@@ -147,14 +147,14 @@ type filesystemProperties struct {
func filesystemFactory() android.Module { func filesystemFactory() android.Module {
module := &filesystem{} module := &filesystem{}
module.filterPackagingSpec = module.filterInstallablePackagingSpec module.filterPackagingSpec = module.filterInstallablePackagingSpec
initFilesystemModule(module) initFilesystemModule(module, module)
return module return module
} }
func initFilesystemModule(module *filesystem) { func initFilesystemModule(module android.DefaultableModule, filesystemModule *filesystem) {
module.AddProperties(&module.properties) module.AddProperties(&filesystemModule.properties)
android.InitPackageModule(module) android.InitPackageModule(filesystemModule)
module.PackagingBase.DepsCollectFirstTargetOnly = true filesystemModule.PackagingBase.DepsCollectFirstTargetOnly = true
android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon) android.InitAndroidMultiTargetsArchModule(module, android.DeviceSupported, android.MultilibCommon)
android.InitDefaultableModule(module) android.InitDefaultableModule(module)
} }

2
filesystem/system_image.go
View File

@@ -38,7 +38,7 @@ func systemImageFactory() android.Module {
module.AddProperties(&module.properties) module.AddProperties(&module.properties)
module.filesystem.buildExtraFiles = module.buildExtraFiles module.filesystem.buildExtraFiles = module.buildExtraFiles
module.filesystem.filterPackagingSpec = module.filterPackagingSpec module.filesystem.filterPackagingSpec = module.filterPackagingSpec
initFilesystemModule(&module.filesystem) initFilesystemModule(module, &module.filesystem)
return module return module
} }