From 76a6e9596de569007603982c8ad27c894ce315c0 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Thu, 7 Nov 2024 16:56:45 -0800 Subject: Build ramdisk with soong This is the first step to build the ramdisk, it still has some diffs with with the make-generated ramdisk though. Bug: 378146476 Test: m soong_generated_ramdisk_filesystem_test Change-Id: I767ea9d09e4d6413c2ec5af3120595e2001c9bb7 --- filesystem/filesystem.go | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'filesystem/filesystem.go') diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index f72cf1715..16bc2e067 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -292,10 +292,14 @@ func (f *filesystem) partitionName() string { func (f *filesystem) FilterPackagingSpec(ps android.PackagingSpec) bool { // Filesystem module respects the installation semantic. A PackagingSpec from a module with // IsSkipInstall() is skipped. + if ps.SkipInstall() { + return false + } if proptools.Bool(f.properties.Is_auto_generated) { // TODO (spandandas): Remove this. - return !ps.SkipInstall() && (ps.Partition() == f.PartitionType()) + pt := f.PartitionType() + return pt == "ramdisk" || ps.Partition() == pt } - return !ps.SkipInstall() + return true } var pctx = android.NewPackageContext("android/soong/filesystem") @@ -664,6 +668,7 @@ var validPartitions = []string{ "vendor_dlkm", "odm_dlkm", "system_dlkm", + "ramdisk", } func (f *filesystem) addMakeBuiltFiles(ctx android.ModuleContext, builder *android.RuleBuilder, rootDir android.Path) { -- cgit v1.2.3-59-g8ed1b