Add fs_config_files/fs_config_dirs/build_prop to system_dlkm
system_dlkm.img contains these metadata files in addition to the .ko
files. This CL pacakges these files via the following
1. Hardcode the deps in filesystem_creator.go, since these are auto
included by kati packaging system
2. Set partition type on the system_dlkm filesystem and
system_dlkm_specific: true on the prebuilt kernel modules. This
ensures that the partition based packaging filter does not cause
these files to be skipped.
Test: m soong_generated_system_dlkm_filesystem_test
KATI only installed file(s):
etc/NOTICE.xml.gz
Change-Id: I367f3c662f5e5bcd6cf452905b599e6725281c81
diff --git a/fsgen/fsgen_mutators.go b/fsgen/fsgen_mutators.go
index e530a5b..2d4ad79 100644
--- a/fsgen/fsgen_mutators.go
+++ b/fsgen/fsgen_mutators.go
@@ -146,8 +146,14 @@
"com.android.vndk.v33": defaultDepCandidateProps(ctx.Config()),
"com.android.vndk.v34": defaultDepCandidateProps(ctx.Config()),
},
- "system_dlkm": {},
- "userdata": {},
+ "userdata": {},
+ "system_dlkm": {
+ // these are phony required deps of the phony fs_config_dirs_nonsystem
+ "fs_config_dirs_system_dlkm": defaultDepCandidateProps(ctx.Config()),
+ "fs_config_files_system_dlkm": defaultDepCandidateProps(ctx.Config()),
+ // build props are automatically added to `ALL_DEFAULT_INSTALLED_MODULES`
+ "system_dlkm-build.prop": defaultDepCandidateProps(ctx.Config()),
+ },
},
fsDepsMutex: sync.Mutex{},
moduleToInstallationProps: map[string]installationProperties{},