tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Add mount_point property to android_filesystem" into main

Browse source
This commit is contained in:
Treehugger Robot 2023-11-01 23:32:27 +00:00 committed by Gerrit Code Review
commit b92dac45d0
1 changed files with 4 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
filesystem/filesystem.go
View file

@ -104,6 +104,9 @@ type filesystemProperties struct {
// When set, passed to mkuserimg_mke2fs --mke2fs_uuid & --mke2fs_hash_seed. // When set, passed to mkuserimg_mke2fs --mke2fs_uuid & --mke2fs_hash_seed.
// Otherwise, they'll be set as random which might cause indeterministic build output. // Otherwise, they'll be set as random which might cause indeterministic build output.
Uuid *string Uuid *string
// Mount point for this image. Default is "/"
Mount_point *string
} }
// android_filesystem packages a set of modules and their transitive dependencies into a filesystem // android_filesystem packages a set of modules and their transitive dependencies into a filesystem
@ -332,7 +335,7 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (propFile android.
} }
addStr("fs_type", fsTypeStr(f.fsType(ctx))) addStr("fs_type", fsTypeStr(f.fsType(ctx)))
addStr("mount_point", "/") addStr("mount_point", proptools.StringDefault(f.properties.Mount_point, "/"))
addStr("use_dynamic_partition_size", "true") addStr("use_dynamic_partition_size", "true")
addPath("ext_mkuserimg", ctx.Config().HostToolPath(ctx, "mkuserimg_mke2fs")) addPath("ext_mkuserimg", ctx.Config().HostToolPath(ctx, "mkuserimg_mke2fs"))
// b/177813163 deps of the host tools have to be added. Remove this. // b/177813163 deps of the host tools have to be added. Remove this.