diff options
| author | 2024-11-12 13:24:05 -0800 | |
|---|---|---|
| committer | 2024-11-12 13:30:14 -0800 | |
| commit | c88cff15e034771ecd507c6729db16cd7d1d26b2 (patch) | |
| tree | 78efa5451a8531ac13bd62dc0311ad64b1cc84ee /filesystem/system_image.go | |
| parent | 94010d3b14314f748ffb377788f27923baa2adc7 (diff) | |
Make ModifyPackagingSpec generic to any filesystem
ModifyPackagingSpec was added to support installing product-partition
modules on the system partition for GSI, but ramdisk also has a very
similar issue, where it's modules are installed to the "ramdisk/system"
partition.
Make ModifyPackagingSpec generic so that it works on the ramdisk files.
This reduces the ramdisk file diff down to just a missing build.prop
file.
Bug: 378146476
Test: m soong_generated_ramdisk_filesystem_test on aosp_cf_x86_64_phone
Change-Id: I1d197679a1128400b6bb837d99e3aabe2ab3c68e
Diffstat (limited to 'filesystem/system_image.go')
| -rw-r--r-- | filesystem/system_image.go | 9 |
1 files changed, 0 insertions, 9 deletions
diff --git a/filesystem/system_image.go b/filesystem/system_image.go index 4d176ae45..d03eab45b 100644 --- a/filesystem/system_image.go +++ b/filesystem/system_image.go @@ -18,7 +18,6 @@ import ( "android/soong/android" "android/soong/linkerconfig" - "path/filepath" "strings" "github.com/google/blueprint/proptools" @@ -64,11 +63,3 @@ func (s *systemImage) FilterPackagingSpec(ps android.PackagingSpec) bool { (ps.Partition() == "system" || ps.Partition() == "root" || strings.HasPrefix(ps.Partition(), "system/")) } - -func (s *systemImage) ModifyPackagingSpec(ps *android.PackagingSpec) { - if strings.HasPrefix(ps.Partition(), "system/") { - subPartition := strings.TrimPrefix(ps.Partition(), "system/") - ps.SetPartition("system") - ps.SetRelPathInPackage(filepath.Join(subPartition, ps.RelPathInPackage())) - } -} |