ScoopDroid/android_build_soong
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "Add selinux contexts to autogenerated partitions" into main

Browse source
This commit is contained in:
Cole Faust 2024-12-05 20:14:08 +00:00 • committed by Gerrit Code Review
commit d2505873e5
2 changed files with 34 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
filesystem/filesystem.go
View file

@ -130,9 +130,13 @@ type FilesystemProperties struct {
// checks, and will be used in the future for API surface checks.
Partition_type *string
// file_contexts file to make image. Currently, only ext4 is supported.
// file_contexts file to make image. Currently, only ext4 is supported. These file contexts
// will be compiled with sefcontext_compile
File_contexts *string `android:"path"`
// The selinux file contexts, after having already run them through sefcontext_compile
Precompiled_file_contexts *string `android:"path"`
// Base directory relative to root, to which deps are installed, e.g. "system". Default is "."
// (root).
Base_dir *string
@ -679,8 +683,15 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (android.Path, and
addStr("avb_salt", f.salt())
}
if proptools.String(f.properties.File_contexts) != "" {
if f.properties.File_contexts != nil && f.properties.Precompiled_file_contexts != nil {
ctx.ModuleErrorf("file_contexts and precompiled_file_contexts cannot both be set")
} else if f.properties.File_contexts != nil {
addPath("selinux_fc", f.buildFileContexts(ctx))
} else if f.properties.Precompiled_file_contexts != nil {
src := android.PathForModuleSrc(ctx, *f.properties.Precompiled_file_contexts)
if src != nil {
addPath("selinux_fc", src)
}
}
if timestamp := proptools.String(f.properties.Fake_timestamp); timestamp != "" {
addStr("timestamp", timestamp)

33
fsgen/filesystem_creator.go
View file

@ -328,6 +328,20 @@ func partitionSpecificFsProps(ctx android.EarlyModuleContext, fsProps *filesyste
Target: proptools.StringPtr("/data/cache"),
Name: proptools.StringPtr("cache"),
},
// For Treble Generic System Image (GSI), system-as-root GSI needs to work on
// both devices with and without /odm_dlkm partition. Those symlinks are for
// devices without /odm_dlkm partition. For devices with /odm_dlkm
// partition, mount odm_dlkm.img under /odm_dlkm will hide those symlinks.
// Note that /odm_dlkm/lib is omitted because odm DLKMs should be accessed
// via /odm/lib/modules directly. All of this also applies to the vendor_dlkm symlink
filesystem.SymlinkDefinition{
Target: proptools.StringPtr("/odm/odm_dlkm/etc"),
Name: proptools.StringPtr("odm_dlkm/etc"),
},
filesystem.SymlinkDefinition{
Target: proptools.StringPtr("/vendor/vendor_dlkm/etc"),
Name: proptools.StringPtr("vendor_dlkm/etc"),
},
}
fsProps.Dirs = proptools.NewSimpleConfigurable([]string{
// From generic_rootdirs in build/make/target/product/generic/Android.bp
@ -777,6 +791,13 @@ func generateFsProps(ctx android.EarlyModuleContext, partitionType string) (*fil
fsProps.Partition_name = proptools.StringPtr(partitionType)
switch partitionType {
// The partitions that support file_contexts came from here:
// https://cs.android.com/android/platform/superproject/main/+/main:build/make/core/Makefile;l=2270;drc=ad7cfb56010cb22c3aa0e70cf71c804352553526
case "system", "userdata", "cache", "vendor", "product", "system_ext", "odm", "vendor_dlkm", "odm_dlkm", "system_dlkm", "oem":
fsProps.Precompiled_file_contexts = proptools.StringPtr(":file_contexts_bin_gen")
}
if !strings.Contains(partitionType, "ramdisk") {
fsProps.Base_dir = proptools.StringPtr(partitionType)
}
@ -785,18 +806,6 @@ func generateFsProps(ctx android.EarlyModuleContext, partitionType string) (*fil
partitionSpecificFsProps(ctx, fsProps, partitionVars, partitionType)
// system_image properties that are not set:
// - filesystemProperties.Avb_hash_algorithm
// - filesystemProperties.File_contexts
// - filesystemProperties.Dirs
// - filesystemProperties.Symlinks
// - filesystemProperties.Fake_timestamp
// - filesystemProperties.Uuid
// - filesystemProperties.Mount_point
// - filesystemProperties.Include_make_built_files
// - filesystemProperties.Build_logtags
// - systemImageProperties.Linker_config_src
return fsProps, true
}