diff options
| author | 2024-11-21 23:51:05 +0000 | |
|---|---|---|
| committer | 2024-11-21 23:51:05 +0000 | |
| commit | 1fc865a9a4c3d0d4fcfecf687e33e9007bf89113 (patch) | |
| tree | 118a921541144c1b5f61bfaea4d6b64662048b93 /fsgen/filesystem_creator.go | |
| parent | 6acec867487db1158cf7eeaa3001d3d921c2c9c7 (diff) | |
| parent | 60525aaf51b2f3bc099ba706df3bc2130c4f4256 (diff) | |
Merge "Fix system image file diffs" into main am: 9d387facdb am: 60525aaf51
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3370004
Change-Id: I95ba3ffe7bd2b9907c2ab47211ae72136a7b6e95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
Diffstat (limited to 'fsgen/filesystem_creator.go')
| -rw-r--r-- | fsgen/filesystem_creator.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fsgen/filesystem_creator.go b/fsgen/filesystem_creator.go index 08812ecdb..e8b0a4fb7 100644 --- a/fsgen/filesystem_creator.go +++ b/fsgen/filesystem_creator.go @@ -314,9 +314,11 @@ func (f *filesystemCreator) createPartition(ctx android.LoadHookContext, partiti return false } - if partitionType == "vendor" || partitionType == "product" { + if partitionType == "vendor" || partitionType == "product" || partitionType == "system" { fsProps.Linker_config.Gen_linker_config = proptools.BoolPtr(true) - fsProps.Linker_config.Linker_config_srcs = f.createLinkerConfigSourceFilegroups(ctx, partitionType) + if partitionType != "system" { + fsProps.Linker_config.Linker_config_srcs = f.createLinkerConfigSourceFilegroups(ctx, partitionType) + } } if android.InList(partitionType, dlkmPartitions) { |