diff options
| author | 2024-09-17 20:07:08 +0000 | |
|---|---|---|
| committer | 2024-09-17 20:07:08 +0000 | |
| commit | 809aaeb90bd7804d8d181377ef0ac232b3486004 (patch) | |
| tree | 56fa29da717cad7d465377dadea2ad1c0040f52f /filesystem/filesystem.go | |
| parent | e95232426d5c829fcc58ee18f148edd6a80ac6b3 (diff) | |
| parent | 2cfe696f4cdfd23e5cad7c951351ac82291aa439 (diff) | |
Merge changes I41978037,I19e8a9e8 into main
* changes:
Properly initialize android_system_image modules
Add otherModuleProvider to ConfigurableEvaluatorContext
Diffstat (limited to 'filesystem/filesystem.go')
| -rw-r--r-- | filesystem/filesystem.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 0b390624f..035399282 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -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) } |