From d9c6a5b80257434c698230318a83690011e51591 Mon Sep 17 00:00:00 2001 From: Cole Faust Date: Tue, 21 May 2024 14:54:00 -0700 Subject: [PATCH] Make dirs a configurable property The microdroid system image customizes dirs using soong config variables, make it configurable so that selects can be used instead. Bug: 342006386 Test: Presubmits Change-Id: I4fbf4dc0a04ad1d1f6539476408606028390cd64 --- filesystem/filesystem.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index 8b71e85c7..d2572c269 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -106,7 +106,7 @@ type filesystemProperties struct { Base_dir *string // Directories to be created under root. e.g. /dev, /proc, etc. - Dirs []string + Dirs proptools.Configurable[[]string] // Symbolic links to be created under root with "ln -sf ". Symlinks []symlinkDefinition @@ -243,7 +243,7 @@ func validatePartitionType(ctx android.ModuleContext, p partition) { // already in `rootDir`. func (f *filesystem) buildNonDepsFiles(ctx android.ModuleContext, builder *android.RuleBuilder, rootDir android.OutputPath) { // create dirs and symlinks - for _, dir := range f.properties.Dirs { + for _, dir := range f.properties.Dirs.GetOrDefault(ctx, nil) { // OutputPath.Join verifies dir builder.Command().Text("mkdir -p").Text(rootDir.Join(ctx, dir).String()) }