Soong filesystem may install aconfig_flags.pb
By setting aconfig_flags: true, soong filesystem module installs the aconfig_flags.pb file to its etc directory. We need to define aconfigFilePaths to ModuleBase to store the list of aconfig file paths that is generated from the GenerateBuildActions(). The aconfigFilePaths are collected when build the filesystem module to build the aconfig_flags.pb for the filesystem image. Bug: 335363964 Test: compare the cache list with those generated from make. Change-Id: Ia32b566bf43174e94b9e610b9503608c6b583899
This commit is contained in:
@@ -131,6 +131,9 @@ type filesystemProperties struct {
|
||||
// Default is false
|
||||
Build_logtags *bool
|
||||
|
||||
// Install aconfig_flags.pb file for the modules installed in this partition.
|
||||
Gen_aconfig_flags_pb *bool
|
||||
|
||||
Fsverity fsverityProperties
|
||||
}
|
||||
|
||||
@@ -300,6 +303,7 @@ func (f *filesystem) buildImageUsingBuildImage(ctx android.ModuleContext) androi
|
||||
f.addMakeBuiltFiles(ctx, builder, rootDir)
|
||||
f.buildFsverityMetadataFiles(ctx, builder, specs, rootDir, rebasedDir)
|
||||
f.buildEventLogtagsFile(ctx, builder, rebasedDir)
|
||||
f.buildAconfigFlagsFiles(ctx, builder, specs, rebasedDir)
|
||||
|
||||
// run host_init_verifier
|
||||
// Ideally we should have a concept of pluggable linters that verify the generated image.
|
||||
@@ -441,6 +445,7 @@ func (f *filesystem) buildCpioImage(ctx android.ModuleContext, compressed bool)
|
||||
f.buildNonDepsFiles(ctx, builder, rootDir)
|
||||
f.buildFsverityMetadataFiles(ctx, builder, specs, rootDir, rebasedDir)
|
||||
f.buildEventLogtagsFile(ctx, builder, rebasedDir)
|
||||
f.buildAconfigFlagsFiles(ctx, builder, specs, rebasedDir)
|
||||
|
||||
output := android.PathForModuleOut(ctx, f.installFileName()).OutputPath
|
||||
cmd := builder.Command().
|
||||
|
Reference in New Issue
Block a user