summaryrefslogtreecommitdiff
path: root/filesystem/android_device.go
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-17 15:58:31 -0700
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2025-03-17 15:58:31 -0700
commite58f350aabfb1d3d55f012259f8e29e25fbb813f (patch)
tree59a3e52ed2051abc08512022e06790507f9a2980 /filesystem/android_device.go
parentb546854edbf9f5c26542983bbe0ae5af5e654204 (diff)
parent227c949bde18d5b1e7b5859ae507b4264f9612f6 (diff)
Merge "Add android_filesystem props to misc_info.txt" into main
Diffstat (limited to 'filesystem/android_device.go')
-rw-r--r--filesystem/android_device.go7
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