diff options
Diffstat (limited to 'filesystem/filesystem.go')
| -rw-r--r-- | filesystem/filesystem.go | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index c3c06bd58..0381951ca 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -90,6 +90,8 @@ type filesystem struct { entries []string filesystemBuilder filesystemBuilder + + selinuxFc android.Path } type filesystemBuilder interface { @@ -417,6 +419,8 @@ type FilesystemInfo struct { // Path to compress hints file for erofs filesystems // This will be nil for other fileystems like ext4 ErofsCompressHints android.Path + + SelinuxFc android.Path } // FullInstallPathInfo contains information about the "full install" paths of all the files @@ -660,6 +664,7 @@ func (f *filesystem) GenerateAndroidBuildActions(ctx android.ModuleContext) { Json: installedFileJson, }, ErofsCompressHints: erofsCompressHints, + SelinuxFc: f.selinuxFc, } android.SetProvider(ctx, FilesystemProvider, fsInfo) @@ -1006,12 +1011,12 @@ func (f *filesystem) buildPropFile(ctx android.ModuleContext) (android.Path, and 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)) + f.selinuxFc = 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) - } + f.selinuxFc = android.PathForModuleSrc(ctx, *f.properties.Precompiled_file_contexts) + } + if f.selinuxFc != nil { + addPath("selinux_fc", f.selinuxFc) } if timestamp := proptools.String(f.properties.Fake_timestamp); timestamp != "" { addStr("timestamp", timestamp) |