diff options
| author | 2024-11-13 04:47:01 +0000 | |
|---|---|---|
| committer | 2024-11-13 04:47:01 +0000 | |
| commit | 8ac00ca75bfbccee0862035226c8ac26b47d264f (patch) | |
| tree | 5b3230f2695130d4228b561274b942bbdb7b61d0 /filesystem/system_image.go | |
| parent | 300c022d9261feb49ccbb91bd1aae01313d6b958 (diff) | |
| parent | ad04bb892ed69bb3a8bb49dce74da4fa28ded292 (diff) | |
Merge "Make ModifyPackagingSpec generic to any filesystem" into main am: ad04bb892e
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3345423
Change-Id: Ie03263190c3ea1380fc69c9fc96d132d7386188d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
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())) - } -} |