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

Properly initialize android_system_image modules

Browse Source 
android_system_image just passed its embedded filesystem module to
InitAndroidModule (transitively via initFilesystemModule). This meant
that ModuleBase.module was pointing to the filesystem module, not
the system image module. This was a problem for the new "changeable
configuration" feature I'm working on, but you can also more readily
see the issue if you add a GenerateAndroidBuildActions function to
android_system_image: it won't be called.

Bug: 361816274
Test: Presubmits
Change-Id: I41978037b81910309a000dc1bba327e513ba5dce
This commit is contained in:
Cole Faust
2024-09-17 11:31:14 -07:00
parent 55b56feb86
commit 2cfe696f4c
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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
} }