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

android_filesystem_defaults and visibility rule

Browse Source 
android_systemimage_defaults is deleted and android_filesystem_defaults
is created so that we can have defaults not only for
android_system_image, but also all android_filesystem modules and its
derivatives.

Also, change adds a check which ensures that the partition_type of the
filesystem and its defaults are the same.

Bug: 330665150
Test: m
Change-Id: If635c794534ed89d264eaf7dfc406a8245b8e9f0
This commit is contained in:
Jiyong Park
2024-04-05 18:13:33 +09:00
parent fe66e13714
commit f46b1af969
3 changed files with 83 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
filesystem/system_image.go
View File

@@ -21,7 +21,6 @@ import (
type systemImage struct {
filesystem
android.DefaultableModuleBase
properties systemImageProperties
}
@@ -40,7 +39,6 @@ func systemImageFactory() android.Module {
module.filesystem.buildExtraFiles = module.buildExtraFiles
module.filesystem.filterPackagingSpec = module.filterPackagingSpec
initFilesystemModule(&module.filesystem)
android.InitDefaultableModule(module)
return module
}
@@ -102,17 +100,3 @@ func (s *systemImage) buildLinkerConfigFile(ctx android.ModuleContext, root andr
func (s *systemImage) filterPackagingSpec(ps android.PackagingSpec) bool {
return ps.Partition() == "system"
}
type systemImageDefaults struct {
android.ModuleBase
android.DefaultsModuleBase
}
// android_system_image_defaults is a default module for android_system_image module.
func systemImageDefaultsFactory() android.Module {
module := &systemImageDefaults{}
module.AddProperties(&android.PackagingProperties{})
module.AddProperties(&systemImageProperties{})
android.InitDefaultsModule(module)
return module
}