diff options
Diffstat (limited to 'filesystem')
| -rw-r--r-- | filesystem/android_device.go | 7 | ||||
| -rw-r--r-- | filesystem/filesystem.go | 4 |
2 files changed, 7 insertions, 4 deletions
diff --git a/filesystem/android_device.go b/filesystem/android_device.go index aa7100887..b96c5eae3 100644 --- a/filesystem/android_device.go +++ b/filesystem/android_device.go @@ -395,6 +395,13 @@ func (a *androidDevice) distFiles(ctx android.ModuleContext) { if a.deviceProps.Android_info != nil { ctx.DistForGoal("droidcore-unbundled", android.PathForModuleSrc(ctx, *a.deviceProps.Android_info)) } + if a.miscInfo != nil { + ctx.DistForGoal("droidcore-unbundled", a.miscInfo) + if a.partitionProps.Super_partition_name != nil { + ctx.DistForGoalWithFilename("dist_files", a.miscInfo, "super_misc_info.txt") + } + } + } } diff --git a/filesystem/filesystem.go b/filesystem/filesystem.go index d53cc816e..fd1c784ec 100644 --- a/filesystem/filesystem.go +++ b/filesystem/filesystem.go @@ -1182,10 +1182,6 @@ func (f *filesystem) buildPropFileForMiscInfo(ctx android.ModuleContext) android if proptools.Bool(f.properties.Use_avb) { addStr("avb_"+f.partitionName()+"_hashtree_enable", "true") - if f.properties.Avb_private_key != nil { - key := android.PathForModuleSrc(ctx, *f.properties.Avb_private_key) - addStr("avb_"+f.partitionName()+"_key_path", key.String()) - } addStr("avb_"+f.partitionName()+"_add_hashtree_footer_args", strings.TrimSpace(f.getAvbAddHashtreeFooterArgs(ctx))) } |