Merge changes I32e163b9,Ie2d4ad83 into main

* changes:
  Dist Soong built misc_info.txt in Soong only builds
  Do not write avb_*_key_path of android_filesystem to misc_info.txt

1 files changed, 7 insertions, 0 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")
+			}
+		}
+
 	}
 }