diff options
Diffstat (limited to 'filesystem/android_device.go')
| -rw-r--r-- | filesystem/android_device.go | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index 3f6348dbf..9cb90da12 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -766,8 +766,8 @@ func (a *androidDevice) addMiscInfo(ctx android.ModuleContext) android.Path { } fsInfos := a.getFsInfos(ctx) for _, partition := range android.SortedKeys(fsInfos) { - if fsInfos[partition].UseAvb { - builder.Command().Textf("echo 'avb_%s_hashtree_enable=true' >> %s", partition, miscInfo) + if fsInfos[partition].PropFileForMiscInfo != nil { + builder.Command().Text("cat").Input(fsInfos[partition].PropFileForMiscInfo).Textf(" >> %s", miscInfo) } } if len(a.partitionProps.Vbmeta_partitions) > 0 { @@ -805,6 +805,9 @@ func (a *androidDevice) addMiscInfo(ctx android.ModuleContext) android.Path { builder.Command().Text("cat").Input(bootImgInfo.PropFileForMiscInfo).Textf(" >> %s", miscInfo) } + // Sort and dedup + builder.Command().Textf("sort -u %s -o %s", miscInfo, miscInfo) + builder.Build("misc_info", "Building misc_info") return miscInfo |