From f46b1af96993ed4a92cf32aba289b7f2decb9811 Mon Sep 17 00:00:00 2001 From: Jiyong Park Date: Fri, 5 Apr 2024 18:13:33 +0900 Subject: android_filesystem_defaults and visibility rule 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 --- filesystem/system_image.go | 16 ---------------- 1 file changed, 16 deletions(-) (limited to 'filesystem/system_image.go') diff --git a/filesystem/system_image.go b/filesystem/system_image.go index 92bb206bc..5028a493e 100644 --- a/filesystem/system_image.go +++ b/filesystem/system_image.go @@ -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 -} -- cgit v1.2.3-59-g8ed1b