diff options
| -rw-r--r-- | fsgen/filesystem_creator.go | 6 | ||||
| -rw-r--r-- | fsgen/fsgen_mutators.go | 1 |
2 files changed, 4 insertions, 3 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) { diff --git a/fsgen/fsgen_mutators.go b/fsgen/fsgen_mutators.go index 12f99566e..9472a50ae 100644 --- a/fsgen/fsgen_mutators.go +++ b/fsgen/fsgen_mutators.go @@ -98,7 +98,6 @@ func createFsGenState(ctx android.LoadHookContext, generatedPrebuiltEtcModuleNam "com.android.apex.cts.shim.v1_prebuilt": defaultDepCandidateProps(ctx.Config()), "dex_bootjars": defaultDepCandidateProps(ctx.Config()), "framework_compatibility_matrix.device.xml": defaultDepCandidateProps(ctx.Config()), - "init.environ.rc-soong": defaultDepCandidateProps(ctx.Config()), "libcompiler_rt": defaultDepCandidateProps(ctx.Config()), "libdmabufheap": defaultDepCandidateProps(ctx.Config()), "libgsi": defaultDepCandidateProps(ctx.Config()), |